Skip to content

Commit

Permalink
Loading
Loading status checks…
Roll third_party/glmark2/src/ ca8de51fe..2054465f6 (77 commits)
Browse files Browse the repository at this point in the history 
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]>
Takuto Ikuta authored and Angle LUCI CQ committed Jan 9, 2025

Verified

This commit was signed with the committer’s verified signature.
wheeheee
GPG key ID: 9BD088BAAE4699BE
Verified
Learn about vigilant mode
1 parent cf9949b commit 68b594e
Showing 3 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion DEPS
View file
Original file line number Diff line number Diff line change
@@ -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@ca8de51fedb70bace5351c6b002eb952c747e889',
'url': Var('chromium_git') + '/external/github.com/glmark2/glmark2@2054465f6f7c9ed2d82f633bb0c88a3222f4a63a',
},

'third_party/googletest': {
13 changes: 10 additions & 3 deletions third_party/glmark2/BUILD.gn
View file
Original file line number Diff line number Diff line change
@@ -126,9 +126,7 @@ 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" ]
@@ -163,6 +161,8 @@ template("glmark2_libmatrix") {
}
public_deps = [ ":glmark2_headers" ]
public_configs = [ ":glmark2_libmatrix_config" ]
configs += [ "//build/config/compiler:exceptions" ]
configs -= [ "//build/config/compiler:no_exceptions" ]
}
}

@@ -279,6 +279,7 @@ 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",
@@ -313,6 +314,9 @@ template("glmark2_common") {
"${angle_libpng_dir}:libpng",
"${angle_root}/third_party:jpeg",
]

configs += [ "//build/config/compiler:exceptions" ]
configs -= [ "//build/config/compiler:no_exceptions" ]
}
}

@@ -346,7 +350,10 @@ template("glmark2_exe") {
]
data = [ "src/data/" ]

defines += [ "GLMARK_VERSION=\"${glmark2_version}\"" ]
defines += [
"GLMARK_VERSION=\"${glmark2_version}\"",
"GLMARK2_EXECUTABLE=\"${target_name}\"",
]

if (is_win) {
defines += [ "GLMARK2_USE_WIN32" ]
2 changes: 1 addition & 1 deletion third_party/glmark2/src
Submodule src updated 93 files
+47 −11 .github/workflows/build.yml
+11 −0 .github/x86_64-w64-mingw32.txt
+3 −3 INSTALL
+23 −0 NEWS
+1 −1 android/AndroidManifest.xml
+1 −1 android/jni/Android.mk
+1 −1 android/jni/Android.ndk.mk
+1 −0 android/jni/Application.mk
+1 −0 android/src/org/linaro/glmark2/EditorActivity.java
+1 −9 data/shaders/bump-height.frag
+0 −4 data/shaders/bump-normals-tangent.frag
+1 −5 data/shaders/conditionals.frag
+1 −5 data/shaders/function.frag
+0 −4 data/shaders/jellyfish.frag
+1 −5 data/shaders/loop.frag
+2 −12 data/shaders/terrain-noise.frag
+1 −7 data/shaders/terrain-texture.vert
+1 −5 data/shaders/terrain.frag
+25 −3 doc/glmark2.1.in
+9 −0 fastlane/metadata/android/en-US/changelogs/20211223
+12 −0 fastlane/metadata/android/en-US/changelogs/20230119
+46 −10 meson.build
+6 −1 meson_options.txt
+2 −4 src/benchmark.cpp
+24 −13 src/canvas-android.cpp
+1 −0 src/canvas-android.h
+41 −4 src/canvas-generic.cpp
+1 −0 src/canvas-generic.h
+33 −14 src/gl-state-egl.cpp
+27 −11 src/gl-state-glx.cpp
+1 −0 src/gl-state-glx.h
+28 −3 src/gl-visual-config.cpp
+3 −3 src/gl-visual-config.h
+6 −6 src/image-reader.cpp
+5 −4 src/image-reader.h
+0 −1,224 src/include/dirent.h
+0 −4 src/include/getopt.h
+0 −45 src/include/sys/time.h
+57 −0 src/libjpeg-turbo/meson.build
+34 −3 src/libmatrix/log.cc
+2 −0 src/libmatrix/log.h
+1 −0 src/libmatrix/program.h
+17 −1 src/libmatrix/shader-source.cc
+80 −42 src/libmatrix/util.cc
+19 −8 src/libmatrix/util.h
+32 −0 src/libpng/meson.build
+82 −5 src/main-loop.cpp
+53 −17 src/main.cpp
+61 −1 src/meson.build
+41 −47 src/model.cpp
+8 −6 src/model.h
+191 −57 src/native-state-drm.cpp
+6 −14 src/native-state-drm.h
+172 −0 src/native-state-gbm.cpp
+19 −15 src/native-state-gbm.h
+0 −274 src/native-state-mir.cpp
+8 −0 src/native-state-wayland.cpp
+73 −7 src/native-state-x11.cpp
+3 −1 src/native-state-x11.h
+115 −3 src/options.cpp
+25 −0 src/options.h
+232 −0 src/results-file.cpp
+49 −0 src/results-file.h
+1 −26 src/scene-buffer.cpp
+1 −14 src/scene-build.cpp
+1 −14 src/scene-bump.cpp
+0 −54 src/scene-clear.cpp
+2 −0 src/scene-collection.h
+0 −4 src/scene-conditionals.cpp
+1 −22 src/scene-desktop.cpp
+0 −11 src/scene-effect-2d.cpp
+0 −4 src/scene-function.cpp
+1 −10 src/scene-grid.cpp
+6 −32 src/scene-ideas.cpp
+1 −0 src/scene-ideas/logo.cc
+5 −22 src/scene-jellyfish.cpp
+0 −4 src/scene-loop.cpp
+1 −14 src/scene-pulsar.cpp
+2 −26 src/scene-refract.cpp
+1 −14 src/scene-shading.cpp
+1 −25 src/scene-shadow.cpp
+1 −26 src/scene-terrain.cpp
+1 −0 src/scene-terrain/overlay-renderer.cpp
+1 −14 src/scene-texture.cpp
+91 −30 src/scene.cpp
+153 −109 src/scene.h
+11 −50 src/texture.cpp
+6 −4 src/texture.h
+1 −13 src/wscript_build
+28 −0 src/zlib/meson.build
+1 −1 waflib/ConfigSet.py
+2 −2 waflib/Context.py
+10 −6 wscript

0 comments on commit 68b594e

Please sign in to comment.