Revert "Roll third_party/glmark2/src/ ca8de51fe..2054465f6 (77 commits)"

This reverts commit 68b594e.

Reason for revert: breaks Perf bots:
https://ci.chromium.org/ui/p/angle/builders/ci/linux-nvidia-gtx1660-perf/4958/overview
https://ci.chromium.org/ui/p/angle/builders/ci/win10-intel-uhd630-perf/4885/overview
https://ci.chromium.org/ui/p/angle/builders/ci/win10-nvidia-gtx1660-perf/4881/overview
https://ci.chromium.org/ui/p/angle/builders/ci/linux-intel-uhd630-perf/4903/overview

Original change's description:
> Roll third_party/glmark2/src/ ca8de51fe..2054465f6 (77 commits)
>
> https://chromium.googlesource.com/external/github.com/glmark2/glmark2/+log/ca8de51fedb7..2054465f6f7c
>
> $ git log ca8de51fe..2054465f6 --date=short --no-merges --format='%ad %ae %s'
> 2024-04-25 alexandros.frantzis Use std::filesystem throughout the codebase
> 2024-04-25 alexandros.frantzis android: Build native code with C++17
> 2024-04-25 alexandros.frantzis Doc: Recommend meson for building win32 flavors
> 2024-04-25 alexandros.frantzis github: Build win32 flavors with msvc in CI
> 2024-04-25 alexandros.frantzis github: Build win32 flavors with mingw in CI
> 2024-04-25 alexandros.frantzis include/getopt: Always use non-const char array to avoid MSVC errors
> 2024-04-25 alexandros.frantzis libmatrix: Add utility function to get idle time
> 2024-04-25 alexandros.frantzis libmatrix: Add utility function to get process times
> 2024-04-24 alexandros.frantzis libmatrix: Add utility function to get the number of processors
> 2024-04-25 alexandros.frantzis libmatrix: Use C++ std::chrono instead of clock_gettime
> 2024-04-25 alexandros.frantzis libmatrix: Use C++17 std::filesystem instead of dirent
> 2024-04-25 alexandros.frantzis Build: Add support for win32 flavors in meson
> 2024-04-24 alexandros.frantzis libmatrix: Provide a copy of the va_list to __android_log_vprint
> 2024-04-13 kode54 NativeStateX11: Fix WM_DELETE_WINDOW handling
> 2024-02-15 alexandros.frantzis NativeStateWayland: Explicitly destroy all Wayland resources at shutdown
> 2024-02-15 alexandros.frantzis Explicitly release GL related resources at shutdown
> 2023-06-03 prlw1 src/meson.build: add x11 dependency to glx
> 2024-02-07 timchen021 Fix memory leaks using smart pointers
> 2024-01-12 daniel.levin Add missing includes in scene-collection.h
> 2023-11-01 alexandros.frantzis GLVisualConfig: By default don't care about the stencil config component
> 2023-11-01 alexandros.frantzis Options,GLStateEGL,GLStateGLX: Add option to require a good visual config
> 2023-07-26 abs GLStateEGL,GLStateGLX: Change failure to get a "good" visual config to warning
> 2023-11-01 alexandros.frantzis libmatrix: Add Log::warning() function
> 2023-05-20 prlw1 meson.build: fix build and avoid sigsegv
> 2023-05-03 ofourdan NativeStateX11: Add winsys option for position
> 2023-01-19 alexandros.frantzis Build,Doc: Update files for 2023.01 release
> 2023-01-19 alexandros.frantzis NativeStateMir: Remove Mir/mirclient support
> 2023-01-03 alexandros.frantzis ResultsFile: Support storing results in an XML file
> 2023-01-03 alexandros.frantzis ResultsFile: Support storing results in a CSV file
> 2023-01-03 alexandros.frantzis Options,ResultsFile: Add option to set the results file
> 2023-01-03 alexandros.frantzis Introduce infrastructure to support saving results to a file
> 2023-01-03 alexandros.frantzis CanvasGeneric: Store individual info elements in separate strings
> 2023-01-03 alexandros.frantzis MainLoop: Store indivitual result values in separate strings
> 2023-01-03 alexandros.frantzis Scene: Remove trailing ':' from scene info string
> 2023-01-04 alexandros.frantzis SceneTerrain: Silence unused variable warning
> 2022-12-21 pierre-yves.mordret NativeStateGBM: Lock and release the front buffer on flip
> 2022-12-21 alexandros.frantzis MainLoop,Scene: Support reporting shader compilation time
> 2022-12-20 alexandros.frantzis MainLoop,Scene: Add busy percentage in CPU time results
> 2022-12-20 alexandros.frantzis MainLoop,Scene: Support reporting CPU time results
> 2022-12-20 alexandros.frantzis Options: Introduce option to specify benchmark results to show
> 2022-12-20 alexandros.frantzis Scene: Update elapsed times when a benchmark finishes
> 2022-12-19 alexandros.frantzis Scene: Introduce struct to keep track of elapsed time
> 2022-12-15 alexandros.frantzis Scene: Introduce infrastructure for more complex scene stats
> 2022-12-15 alexandros.frantzis Scene: Move common preparation logic to Scene::prepare
> 2022-12-13 alexandros.frantzis Scene: Introduce non-virtual methods to prepare and finish a scene for benchmark
> 2022-12-08 alexandros.frantzis GLVisualConfig: Support specifying the config id in --visual-config
> 2022-12-08 alexandros.frantzis libmatrix: Support prefix dependent input conversions from string
> 2022-12-08 alexandros.frantzis GLStateEGL,GLStateGLX: Fail if no suitable config is found
> 2022-12-08 alexandros.frantzis GLStateEGL,GLStateGLX: Don't limit the configs passed to our selection mechanism
> 2022-12-08 alexandros.frantzis GLVisualConfig: Penalize configs with components smaller than requested
> 2022-11-16 alexandros.frantzis github: Build x11-gl-egl flavor in CI
> 2022-11-14 rilian-la-te build: Add x11-gl-egl flavor
> 2022-11-10 alexandros.frantzis GLStateGLX: Support multisampled configs
> 2022-11-10 l.stach GLStateEGL: Support multisampled configs
> 2022-11-10 l.stach GLVisualConfig: Add multisampling support
> 2022-09-02 120989324 Add missing newline at end of log messages
> 2022-11-10 alexandros.frantzis NativeStateDRM,NativeStateGBM: Support configuring the DRM device
> 2022-11-10 alexandros.frantzis Options: Support passing window system specific options
> 2022-04-23 nunes.erico NativeStateGBM: Add GBM offscreen backend
> 2022-07-07 wuqianhai SceneJellyfish: Fix memory leak
> 2022-07-07 wuqianhai SceneRefract: Fix texture leak
> 2022-07-07 wuqianhai SceneIdeas: Fix texture leak
> 2022-06-14 Martin.Jansa waflib: fix compatibility with python-3.11
> 2022-05-12 jeffy.chen NativeStateDRM: Honor visual configuration
> 2022-05-13 alexandros.frantzis GLStateEGL,GLStateGLX: Use SwapInterval 1 for FIFO swap mode
> 2022-04-15 alexandros.frantzis NativeStateDrm: Implement swap interval 0
> 2022-02-14 alexandros.frantzis github: Run apt-get update to get latest packages
> 2022-02-14 alexandros.frantzis CanvasGeneric,CanvasAndroid: Display surface config info
> 2022-02-14 alexandros.frantzis Options: Support --version command line argument
> 2022-02-14 alexandros.frantzis libmatrix: Add missing <utility> include
> 2022-02-10 hillma libmatrix: avoid -Wimplicit-fallthrough
> 2021-12-23 alexandros.frantzis Build,Doc: Update files for 2021.12 release
> 2021-12-23 alexandros.frantzis NativeStateDrm: Fix crash when we can't become DRM master
> 2021-09-30 jf android: Fix benchmark parameter edition
> 2021-08-30 alexandros.frantzis Use highp precision modifier only on GLES
> 2021-08-30 alexandros.frantzis GLStateEGL: Support EGL versions < 1.4
> 2021-04-11 maahiuzeon Fix model loading on big endian.
>
> Created with:
>   roll-dep third_party/glmark2/src
>
> Bug: chromium:40263312
> No-Presubmit: true
> Change-Id: Ifee506badac67ff5af57605994daff01278c6d56
> Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6162277
> Reviewed-by: Yuly Novikov <[email protected]>
> Auto-Submit: Takuto Ikuta <[email protected]>
> Commit-Queue: Yuly Novikov <[email protected]>

Bug: chromium:40263312
Change-Id: Ie43fbff5d784c2a50aae6208bc7fa692593fcdda
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6164165
Commit-Queue: Yuly Novikov <[email protected]>
Bot-Commit: Rubber Stamper <[email protected]>

DEPS

@@ -765,7 +765,7 @@ deps = {
 
   # glmark2 is a GPL3-licensed OpenGL ES 2.0 benchmark. We use it for testing.
   'third_party/glmark2/src': {
-    'url': Var('chromium_git') + '/external/github.com/glmark2/glmark2@2054465f6f7c9ed2d82f633bb0c88a3222f4a63a',
+    'url': Var('chromium_git') + '/external/github.com/glmark2/glmark2@ca8de51fedb70bace5351c6b002eb952c747e889',
   },
 
   'third_party/googletest': {

third_party/glmark2/BUILD.gn

@@ -126,7 +126,9 @@ source_set("glmark2_headers") {
   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" ]
@@ -161,8 +163,6 @@ template("glmark2_libmatrix") {
     }
     public_deps = [ ":glmark2_headers" ]
     public_configs = [ ":glmark2_libmatrix_config" ]
-    configs += [ "//build/config/compiler:exceptions" ]
-    configs -= [ "//build/config/compiler:no_exceptions" ]
   }
 }
 
@@ -279,7 +279,6 @@ template("glmark2_common") {
       "src/src/model.h",
       "src/src/native-state.h",
       "src/src/options.cpp",
-      "src/src/results-file.cpp",
       "src/src/scene-buffer.cpp",
       "src/src/scene-build.cpp",
       "src/src/scene-bump.cpp",
@@ -314,9 +313,6 @@ template("glmark2_common") {
       "${angle_libpng_dir}:libpng",
       "${angle_root}/third_party:jpeg",
     ]
-
-    configs += [ "//build/config/compiler:exceptions" ]
-    configs -= [ "//build/config/compiler:no_exceptions" ]
   }
 }
 
@@ -350,10 +346,7 @@ template("glmark2_exe") {
     ]
     data = [ "src/data/" ]
 
-    defines += [
-      "GLMARK_VERSION=\"${glmark2_version}\"",
-      "GLMARK2_EXECUTABLE=\"${target_name}\"",
-    ]
+    defines += [ "GLMARK_VERSION=\"${glmark2_version}\"" ]
 
     if (is_win) {
       defines += [ "GLMARK2_USE_WIN32" ]