Roll glmark2.

Includes build for Android, test fixes, and swapInterval 0 for WGL. Bug: angleproject:3806 Change-Id: Ied8f221fc3002cff2ccdc83dc6d45bc8640a4a4d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1752017Reviewed-by: James Dong <dongja@google.com> Reviewed-by: Cody Northrop <cnorthrop@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Roll glmark2.
2971fd34 · Jamie Madill · Commit Bot · 99cffe5d · 2971fd34 · 2971fd34
Commit 2971fd34 authored Aug 12, 2019 by Jamie Madill Committed by Commit Bot Aug 14, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

DEPS DEPS +1 -1

BUILD.gn third_party/glmark2/BUILD.gn +9 -4

No files found.
--- a/DEPS
+++ b/DEPS
@@ -80,7 +80,7 @@ deps = {

  # 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',
+    'url': '{chromium_git}/external/github.com/glmark2/glmark2@9e01aef1a786b28aca73135a5b00f85c357e8f5e',
  },

  '{angle_root}/third_party/glslang/src': {

--- a/third_party/glmark2/BUILD.gn
+++ b/third_party/glmark2/BUILD.gn
@@ -6,17 +6,22 @@

 import("../../gni/angle.gni")

-glmark2_glad_common_sources = [
+_glmark2_glad_common_sources = [
  "src/src/glad/include/glad/egl.h",
+  "src/src/glad/include/glad/wgl.h",
  "src/src/glad/src/egl.c",
 ]

+if (is_win) {
+  _glmark2_glad_common_sources += [ "src/src/glad/src/wgl.c" ]
+}
+
 config("glmark2_glad_config") {
  include_dirs = [ "src/src/glad/include" ]
 }

 source_set("glmark2_glad_gles") {
-  sources = glmark2_glad_common_sources + [
+  sources = _glmark2_glad_common_sources + [
              "src/src/glad/include/glad/gles2.h",
              "src/src/glad/src/gles2.c",
            ]
@@ -24,7 +29,7 @@ source_set("glmark2_glad_gles") {
 }

 source_set("glmark2_glad_gl") {
-  sources = glmark2_glad_common_sources + [
+  sources = _glmark2_glad_common_sources + [
              "src/src/glad/include/glad/gl.h",
              "src/src/glad/src/gl.c",
            ]
@@ -104,6 +109,7 @@ source_set("glmark2_headers") {
    "src/src/gl-state.h",
    "src/src/gl-visual-config.h",
    "src/src/mesh.h",
+    "src/src/options.h",
    "src/src/scene.h",
    "src/src/shared-library.h",
    "src/src/texture.h",
@@ -274,7 +280,6 @@ template("glmark2_common") {
      "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",