Remove ANGLE

This marks the end of EGL and OpenGL ES support on Windows.

The concepts of -opengl dynamic, -opengl desktop, QT_OPENGL=software,
etc. remain unchanged, with the exception of the disapperance of
everything ANGLE related.

CMake builds now work identically to qmake on Windows: they default to
'dynamic' OpenGL on Windows, unless -DINPUT_opengl=desktop is specified.

On Windows, Qt 6 is expected to default to the "dynamic" OpenGL model by
default, just like Qt 5.15. This can be changed by switching to "desktop"
OpenGL, which will link to opengl32 (publicly, so other libs and applications
will do so as well) and disallows using another OpenGL DLL.

The "dynamic" mode is essential still because the fallback to a software
rasterizer, such as the opengl32sw.dll we ship with the Qt packages,
has to to work exactly like in Qt 5, the removal of ANGLE does not
change this concept in any way (except of course that the middle option
of using ANGLE is now gone)

When it comes to the windows plugin's OpenGL blacklist feature, it works
like before and accepts the ANGLE/D3D related keywords. They will
then be ignored. Similarly, requesting QT_OPENGL=angle is ignored (but
will show a warning).

The D3D11 and DXGI configure time tests are removed: Qt 5.14 already
depends on D3D 11.1 and DXGI 1.3 headers being available unconditionally
on Win32 (in QRhi's D3D11 backend). No need to test for these.

[ChangeLog][Windows] ANGLE is no longer included with Qt. Dynamic OpenGL
builds work like before but ANGLE is no longer an option. OpenGL proper
or an alternative opengl32 implementation are the two remaining options
now. Attempting to set QT_OPENGL=angle or Qt::AA_UseOpenGLES will have
no effect on Windows.

Fixes: QTBUG-79103
Change-Id: Ia404e0d07f3fe191b27434d863c81180112ecb3b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

1 files changed, 0 insertions, 112 deletions

diff --git a/src/3rdparty/angle/src/libANGLE/histogram_macros.h b/src/3rdparty/angle/src/libANGLE/histogram_macros.h
deleted file mode 100644
index fb428b46d2..0000000000
--- a/src/3rdparty/angle/src/libANGLE/histogram_macros.h
+++ /dev/null
@@ -1,112 +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.
-//
-// histogram_macros.h:
-//   Helpers for making histograms, to keep consistency with Chromium's
-//   histogram_macros.h.
-
-#ifndef LIBANGLE_HISTOGRAM_MACROS_H_
-#define LIBANGLE_HISTOGRAM_MACROS_H_
-
-#include <platform/Platform.h>
-
-#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)
-
-// 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)
-
-// 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)
-
-// 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_100(name, sample) \
-    ANGLE_HISTOGRAM_CUSTOM_COUNTS(name, sample, 1, 100, 50)
-
-#define ANGLE_HISTOGRAM_COUNTS_10000(name, sample) \
-    ANGLE_HISTOGRAM_CUSTOM_COUNTS(name, sample, 1, 10000, 50)
-
-#define ANGLE_HISTOGRAM_CUSTOM_COUNTS(name, sample, min, max, bucket_count)                       \
-    ANGLEPlatformCurrent()->histogramCustomCounts(ANGLEPlatformCurrent(), name, sample, min, max, \
-                                                  bucket_count)
-
-#define ANGLE_HISTOGRAM_PERCENTAGE(name, under_one_hundred) \
-    ANGLE_HISTOGRAM_ENUMERATION(name, under_one_hundred, 101)
-
-#define ANGLE_HISTOGRAM_BOOLEAN(name, sample) \
-    ANGLEPlatformCurrent()->histogramBoolean(ANGLEPlatformCurrent(), name, sample)
-
-#define ANGLE_HISTOGRAM_ENUMERATION(name, sample, boundary_value)                      \
-    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_MB(name, sample) ANGLE_HISTOGRAM_CUSTOM_COUNTS( \
-    name, sample, 1, 1000, 50)
-
-#define ANGLE_HISTOGRAM_SPARSE_SLOWLY(name, sample) \
-    ANGLEPlatformCurrent()->histogramSparse(ANGLEPlatformCurrent(), name, sample)
-
-// Scoped class which logs its time on this earth as a UMA statistic. This is
-// recommended for when you want a histogram which measures the time it takes
-// for a method to execute. This measures up to 10 seconds.
-#define SCOPED_ANGLE_HISTOGRAM_TIMER(name) \
-    SCOPED_ANGLE_HISTOGRAM_TIMER_EXPANDER(name, false, __COUNTER__)
-
-// Similar scoped histogram timer, but this uses ANGLE_HISTOGRAM_LONG_TIMES_100,
-// which measures up to an hour, and uses 100 buckets. This is more expensive
-// to store, so only use if this often takes >10 seconds.
-#define SCOPED_ANGLE_HISTOGRAM_LONG_TIMER(name) \
-    SCOPED_ANGLE_HISTOGRAM_TIMER_EXPANDER(name, true, __COUNTER__)
-
-// This nested macro is necessary to expand __COUNTER__ to an actual value.
-#define SCOPED_ANGLE_HISTOGRAM_TIMER_EXPANDER(name, is_long, key) \
-    SCOPED_ANGLE_HISTOGRAM_TIMER_UNIQUE(name, is_long, key)
-
-#define SCOPED_ANGLE_HISTOGRAM_TIMER_UNIQUE(name, is_long, key)                         \
-    class ScopedHistogramTimer##key                                                     \
-    {                                                                                   \
-      public:                                                                           \
-        ScopedHistogramTimer##key()                                                     \
-            : constructed_(ANGLEPlatformCurrent()->currentTime(ANGLEPlatformCurrent())) \
-        {                                                                               \
-        }                                                                               \
-        ~ScopedHistogramTimer##key()                                                    \
-        {                                                                               \
-            if (constructed_ == 0)                                                      \
-                return;                                                                 \
-            auto *platform = ANGLEPlatformCurrent();                                    \
-            double elapsed = platform->currentTime(platform) - constructed_;            \
-            int elapsedMS  = static_cast<int>(elapsed * 1000.0);                        \
-            if (is_long)                                                                \
-            {                                                                           \
-                ANGLE_HISTOGRAM_LONG_TIMES_100(name, elapsedMS);                        \
-            }                                                                           \
-            else                                                                        \
-            {                                                                           \
-                ANGLE_HISTOGRAM_TIMES(name, elapsedMS);                                 \
-            }                                                                           \
-        }                                                                               \
-                                                                                        \
-      private:                                                                          \
-        double constructed_;                                                            \
-    } scoped_histogram_timer_##key
-
-#endif  // LIBANGLE_HISTOGRAM_MACROS_H_