summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-benchmark/glmark2
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2021-01-09 01:11:14 +0300
committerAndrew Geissler <geissonator@yahoo.com>2021-01-09 01:12:46 +0300
commit72956edabebd4188f98e3b0d9f8ce727e8d13ea3 (patch)
tree2948237a0026b455367cc7fd5f64f3fe60f75c53 /meta-openembedded/meta-oe/recipes-benchmark/glmark2
parent015e6aa5df52e64da55eb64ea70ff1a58540d1f6 (diff)
downloadopenbmc-72956edabebd4188f98e3b0d9f8ce727e8d13ea3.tar.xz
meta-openembedded: subtree update:936f2380bb..4599fea881
Alexander Vickberg (1): mbedtls: upgrade to 2.25.0 Andreas Müller (44): xfce4-panel-profiles: upgrade 1.0.10 -> 1.0.12 mousepad: upgrade 0.4.2 -> 0.5.2 xfce4-screenshooter: upgrade 1.9.7 -> 1.9.8 xfce4-taskmanager: upgrade 1.2.3 -> 1.4.0 xfce4-calculator-plugin: upgrade 0.7.0 -> 0.7.1 xfce4-cpugraph-plugin: upgrade 1.1.0 -> 1.2.0 xfce4-datetime-plugin: upgrade 0.8.0 -> 0.8.1 xfce4-diskperf-plugin: upgrade 2.6.2 -> 2.6.3 xfce4-fsguard-plugin: upgrade 1.1.1 -> 1.1.2 xfce4-smartbookmark-plugin: upgrade 0.5.1 -> 0.5.2 xfce4-systemload-plugin: upgrade 1.2.3 -> 1.2.4 xfce4-verve-plugin: upgrade 2.0.0 -> 2.0.1 xfce4-wavelan-plugin: upgrade 0.6.1 -> 0.6.2 xfce4-whiskermenu-plugin: upgrade 2.4.6 -> 2.5.1 xfce4-xkb-plugin: upgrade 0.8.1 -> 0.8.2 xfce4-mount-plugin: upgrade 1.1.3 -> 1.1.5 xfce4-dev-tools: upgrade 4.14.0 -> 4.16.0 libxfce4util: upgrade 4.14.0 -> 4.16.0 xfconf: upgrade 4.14.3 -> 4.16.0 libxfce4ui: upgrade 4.14.1 -> 4.16.0 exo: upgrade 0.12.11 -> 4.16.0 garcon: upgrade 0.7.0 -> 0.8.0 xfwm4: upgrade 4.14.5 -> 4.16.0 xfce4-settings: upgrade 4.14.3 -> 4.16.0 xfce4-panel: upgrade 4.14.4 -> 4.16.0 xfce4-session: upgrade 4.14.2 -> 4.16.0 xfdesktop: upgrade 4.14.2 -> 4.16.0 xfce4-power-manager: upgrade 1.6.6 -> 4.16.0 tumbler: upgrade 0.3.1 -> 4.16.0 thunar-volman: upgrade 0.9.5 -> 4.16.0 thunar: upgrade 1.8.15 -> 4.16.0 xfce4-appfinder: upgrade 4.14.0 -> 4.16.0 xfce4-terminal: 0.8.9.2 -> 0.8.10 xfce4-screensaver: upgrade 0.1.10 -> 4.16.0 xfce4-taskmanager: remove exo-native from DEPENDS xfce4-closebutton-plugin: upgrade 0.1.0+ -> 4.16.0 xfce4-sensors-plugin: upgrade 1.3.92 -> 1.3.95 xfce4-genmon-plugin: upgrade 4.0.2 -> 4.1.0 xfce4-hotcorner-plugin: remove xfce4-embed-plugin: remove for now xfce4-equake-plugin: remove for now xfce4-notes-plugin: remove for now fluidsynth: upgrade 2.1.5 -> 2.1.6 blueman: upgrade 2.1.3 -> 2.1.4 Bruce Ashfield (1): vboxguestdrivers: fix build against kernel v5.10+ Caio Toledo (3): Add recipe for dbus-cxx Add dbus-cxx to packagegroup-meta-oe Fix dbus-cxx build for musl Changqing Li (1): libssh2: enhance ptest Chen Qi (1): tclap: fix branch Chencheng Zhang (1): tclap: align version to tag v1.2.2 Diego Santa Cruz (2): gssdp: Upgrade to 1.2.2 -> 1.2.3 gupnp: Upgrade to 1.2.2 -> 1.2.4 Dmitry Baryshkov (11): android-tools-conf-configfs: add an alternative to anrdoid-tools-conf android-tools-conf: fix android-tools build-deps warning conf/layer.conf: provide default PREFERRED_PROVIDER_android-tools-conf imlib2: add image manipulation libray from englightenment project feh: imlib2 based image viewer obconf: Openbox configuration tool xterm: install xterm and uxterm desktop files xterm: update to version 362 xterm: provide virtual/x-terminal-emulator layer.conf: add gnome-layer dynamic entry openbox-xdgmenu: Openbox menu generator He Zhe (2): ebtables: Add symbol link /sbin/ebtables lmbench: Fix setting LDLIBS failure Hongxu Jia (2): flatbuffers: add python3 support python3-wrapt: add native support Joe Slater (1): multipath-tools: fix error handling for udev_monitor_set_receive_buffer_size Khem Raj (9): pidgin-sipe: Do not add native libdir to pkgconfig search path sdbus-c++-libsystemd: Fix reallocarray check in meson networkmanager: Fix reallocarray check in meson and configure redis: Update to 6.0.9 python3-matplotlib: Disable LTO on mips/clang cyrus-sasl: Disable ntlm plugin by default postgresql: Use /dev/urandom when openssl is not used xrdp: Upgrade to 0.9.14 iwd: Upgrade to 1.10 Leon Anavi (33): python3-stevedore: Upgrade 3.2.2 -> 3.3.0 python3-pychromecast: Upgrade 7.5.1 -> 7.6.0 python3-humanize: Upgrade 3.1.0 -> 3.2.0 python3-fasteners: Upgrade 0.15 -> 0.16 python3-luma-core: Upgrade 2.0.1 -> 2.2.0 python3-chardet: Upgrade 3.0.4 -> 4.0.0 python3-watchdog: Upgrade 0.10.3 -> 1.0.2 python3-natsort: Upgrade 7.0.1 -> 7.1.0 python3-gmqtt: Upgrade 0.6.8 -> 0.6.9 python3-pymongo: Upgrade 3.11.0 -> 3.11.2 python3-requests: Upgrade 2.25.0 -> 2.25.1 python3-nocasedict: Upgrade 1.0.1 -> 1.0.2 python3-soupsieve: Upgrade 2.0.1 -> 2.1 python3-jsonpatch: Upgrade 1.26 -> 1.28 python3-psutil: Upgrade 5.7.3 -> 5.8.0 python3-argcomplete: Upgrade 1.12.1 -> 1.12.2 python3-multidict: Upgrade 5.0.0 -> 5.1.0 python3-nocaselist: Upgrade 1.0.3 -> 1.0.4 python3-prompt-toolkit: Upgrade 3.0.8 -> 3.0.9 python3-pychromecast: Upgrade 7.6.0 -> 7.7.1 python3-txaio: Upgrade 20.4.1 -> 20.12.1 python3-croniter: Upgrade 0.3.36 -> 0.3.37 python3-pandas: Upgrade 1.1.4 -> 1.2.0 python3-sympy: Upgrade 1.6.2 -> 1.7.1 python3-twine: Upgrade 3.2.0 -> 3.3.0 python3-humanfriendly: Upgrade 8.2 -> 9.1 python3-sqlalchemy: Upgrade 1.3.20 -> 1.3.22 python3-transitions: Upgrade 0.8.5 -> 0.8.6 python3-pytest-metadata: Upgrade 1.10.0 -> 1.11.0 python3-smbus2: Upgrade 0.3.0 -> 0.4.0 python3-cantools: Upgrade 35.5.0 -> 36.1.0 python3-sentry-sdk: Upgrade 0.19.1 -> 0.19.5 python3-babel: Upgrade 2.8.0 -> 2.9.0 Mark Jonas (1): beep: Update to 1.4.9 in new repository Martin Jansa (1): linuxconsole: move jscal to separate package, add to packagegroup Michael Vetter (1): jasper: upgrade 2.0.23 -> 2.0.24 Mingli Yu (3): traceroute: change the ALTERNATIVE_PRIORITY tftp-hpa: change the ALTERNATIVE_PRIORITY python3-astor: switch to python3 Ola X Nilsson (1): python3-idna Remove 2.8 Qi.Chen@windriver.com (1): python3-requests: upgrade to 2.25.0 Ramon Fried (2): bitwise: add new recipe yaml-cpp: add new recipe Roland Hieber (3): openct: remove lines that resulted in a no-op openct: clean up do_install openct: allow building as native package Sean Nyekjaer (1): nodejs: 12.19.1 -> 12.20.1 Stacy Gaikovaia (1): nodejs: 12.19.0 -> 12.19.1 Trevor Woerner (1): glmark2: fix precision handling bugs Wang Mingyu (1): zabbix: CVE-2020-15803 Security Advisory Wenlin Kang (1): syslog-ng: add bison-native to dependencies Yi Zhao (9): ebtables: do not install /etc/ethertypes yaffs2-utils: update to latest git rev f2fs-tools: upgrade 1.13.0 -> 1.14.0 dracut: upgrade 049 -> 051 ebtables: add missing file ebtables.common ebtables: remove upstream ebtables-legacy-save ebtables: do not install /etc/ethertypes tcpdump: add UPSTREAM_CHECK_REGEX phpmyadmin: 5.0.2 -> 5.0.4 Zang Ruochen (5): mcpp: Normalize the patch format of CVE python3-aenum: upgrade 2.2.4 -> 2.2.6 python3-autobahn: upgrade 20.7.1 -> 20.12.3 python3-bandit: upgrade 1.6.2 -> 1.7.0 python3-cachetools: upgrade 4.1.1 -> 4.2.0 Zheng Ruoqin (5): samba: CVE-2020-14318 Security Advisory samba: CVE-2020-14383 Security Advisory php: CVE-2020-7070 php: CVE-2020-7069 poppler: upgrade 20.11.0 -> 20.12.1 changqing.li@windriver.com (3): postgresql: upgrade 12.4 -> 13.1 nginx: upgrade 1.16.1 -> 1.18.0 nginx: upgrade 1.17.8 -> 1.19.6 jabdoa2 (2): libsdl2-mixer: Fix ogg/vorbis support in libsdl2-mixer libsdl2-mixer: set --disable-music-ogg-shared to link statically lumag (2): android-tools: fix package split android-tools: split adbd to the separate package zangrc (35): fuse3: upgrade 3.10.0 -> 3.10.1 openipmi: upgrade 2.0.29 -> 2.0.30 vblade: upgrade 24 -> 25 dumb-init: upgrade 1.2.2 -> 1.2.5 fio: upgrade 3.24 -> 3.25 hwdata: upgrade 0.341 -> 0.342 nano: upgrade 5.3 -> 5.4 ocl-icd: upgrade 2.2.13 -> 2.2.14 ebtables: upgrade 2.0.10-4 -> 2.0.11 iscsi-initiator-utils: upgrade 2.1.2 -> 2.1.3 opencl-headers: upgrade 2020.06.16 -> 2020.12.18 opencl-icd-loader: upgrade 2020.06.16 -> 2020.12.18 c-periphery: upgrade 2.2.5 -> 2.3.0 opencl-clhpp: upgrade 2.0.12 -> 2.0.13 uthash: upgrade 2.1.0 -> 2.2.0 libtalloc: upgrade 2.3.0 -> 2.3.1 libtevent: upgrade 0.10.1 -> 0.10.2 ace: upgrade 6.5.10 -> 6.5.12 python3-ldap: upgrade 3.2.0 -> 3.3.1 wolfssl: upgrade 4.5.0 -> 4.6.0 asio: upgrade 1.18.0 -> 1.18.1 dash: upgrade 0.5.11.2 -> 0.5.11.3 geoclue: upgrade 2.5.6 -> 2.5.7 libmicrohttpd: upgrade 0.9.71 -> 0.9.72 nss: upgrade 3.59 -> 3.60 paho-mqtt-c: upgrade 1.3.7 -> 1.3.8 terminus-font: upgrade 4.48 -> 4.49.1 libnet-ldap-perl: upgrade 0.66 -> 0.67 rdma-core: upgrade 32.0 -> 33.0 can-utils: upgrade 2020.11.0 -> 2020.12.0 cpprest: upgrade 2.10.16 -> 2.10.17 haveged: upgrade 1.9.13 -> 1.9.14 live555: upgrade 20201105 -> 20210101 smartmontools: upgrade 7.1 -> 7.2 openjpeg: upgrade 2.3.1 -> 2.4.0 zhengruoqin (12): pugixml: upgrade 1.11 -> 1.11.2 spdlog: upgrade 1.8.1 -> 1.8.2 spitools: upgrade 0.8.5 -> 0.8.6 uhubctl: upgrade 2.2.0 -> 2.3.0 xserver-xorg-cvt-native: upgrade 1.20.9 -> 1.20.10 zchunk: upgrade 1.1.7 -> 1.1.8 libencode-perl: upgrade 3.07 -> 3.08 bridge-utils: upgrade 1.6 -> 1.7 netplan: upgrade 0.100 -> 0.101 opensaf: upgrade 5.20.08 -> 5.20.11 cppzmq: upgrade 4.7.0 -> 4.7.1 gperftools: upgrade 2.8 -> 2.8.1 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I53939ad487155ca87e27cfd77d65962458d892e0
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-benchmark/glmark2')
-rw-r--r--meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0003-fix-precision-handling-bugs.patch138
-rw-r--r--meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb1
2 files changed, 139 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0003-fix-precision-handling-bugs.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0003-fix-precision-handling-bugs.patch
new file mode 100644
index 0000000000..af88f6cd23
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0003-fix-precision-handling-bugs.patch
@@ -0,0 +1,138 @@
+From 90e837ffd1ff5c9add1074d69de23e58a3a4810e Mon Sep 17 00:00:00 2001
+From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
+Date: Wed, 11 Nov 2020 09:26:03 -0500
+Subject: [PATCH 1/3] terrain: Fix precision bug in light rendering
+
+Resulting in overly bright rendering when mediump is implemented as
+fp16.
+
+Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
+---
+ data/shaders/terrain.frag | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/data/shaders/terrain.frag b/data/shaders/terrain.frag
+index 84d085c..58f17ea 100644
+--- a/data/shaders/terrain.frag
++++ b/data/shaders/terrain.frag
+@@ -67,7 +67,12 @@ void main() {
+ vec3 pointSpecular = vec3( 0.0 );
+ for ( int i = 0; i < MAX_POINT_LIGHTS; i ++ ) {
+ vec4 lPosition = viewMatrix * vec4( pointLightPosition[ i ], 1.0 );
++#ifdef GL_FRAGMENT_PRECISION_HIGH
++ // should be highp for correct behaviour if mediump is implemented as fp16
++ highp vec3 lVector = lPosition.xyz + vViewPosition.xyz;
++#else
+ vec3 lVector = lPosition.xyz + vViewPosition.xyz;
++#endif
+ float lDistance = 1.0;
+ if ( pointLightDistance[ i ] > 0.0 )
+ lDistance = 1.0 - min( ( length( lVector ) / pointLightDistance[ i ] ), 1.0 );
+
+From 1edd76fda77edabd49d713912aee49b8360c86c3 Mon Sep 17 00:00:00 2001
+From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
+Date: Wed, 11 Nov 2020 09:49:52 -0500
+Subject: [PATCH 2/3] terrain: Fix precision handling in noise shader
+
+Another overflow resulting in infinity in mediump. Note this bug is
+masked if the driver clamps infinity to MAX_FLOAT, but it's still our
+bug.
+
+Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
+---
+ data/shaders/terrain-noise.frag | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/data/shaders/terrain-noise.frag b/data/shaders/terrain-noise.frag
+index 7fea5c0..9535e58 100644
+--- a/data/shaders/terrain-noise.frag
++++ b/data/shaders/terrain-noise.frag
+@@ -17,7 +17,13 @@ uniform float time;
+ uniform MEDIUMP vec2 uvScale;
+ varying vec2 vUv;
+
++#ifdef GL_FRAGMENT_PRECISION_HIGH
++// x should be passed as highp since the intermediate multiplications can
++// overflow with mediump
++vec4 permute(highp vec4 x)
++#else
+ vec4 permute(vec4 x)
++#endif
+ {
+ return mod(((x * 34.0) + 1.0) * x, 289.0);
+ }
+
+From e866cc633ffc450e5358b2742f32ca360e4f3f12 Mon Sep 17 00:00:00 2001
+From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
+Date: Wed, 11 Nov 2020 09:35:21 -0500
+Subject: [PATCH 3/3] loop,function,conditionals: Fix mediump overflow
+
+The multiplication can produce infinity.
+
+Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
+---
+ data/shaders/conditionals.frag | 9 ++++++++-
+ data/shaders/function.frag | 9 ++++++++-
+ data/shaders/loop.frag | 9 ++++++++-
+ 3 files changed, 24 insertions(+), 3 deletions(-)
+
+diff --git a/data/shaders/conditionals.frag b/data/shaders/conditionals.frag
+index 3bd2507..e902263 100644
+--- a/data/shaders/conditionals.frag
++++ b/data/shaders/conditionals.frag
+@@ -2,7 +2,14 @@ varying vec4 dummy;
+
+ void main(void)
+ {
+- float d = fract(gl_FragCoord.x * gl_FragCoord.y * 0.0001);
++#ifdef GL_FRAGMENT_PRECISION_HIGH
++ // should be declared highp since the multiplication can overflow in
++ // mediump, particularly if mediump is implemented as fp16
++ highp vec2 FragCoord = gl_FragCoord.xy;
++#else
++ vec2 FragCoord = gl_FragCoord.xy;
++#endif
++ float d = fract(FragCoord.x * FragCoord.y * 0.0001);
+
+ $MAIN$
+
+diff --git a/data/shaders/function.frag b/data/shaders/function.frag
+index 3e3c74f..9d0230e 100644
+--- a/data/shaders/function.frag
++++ b/data/shaders/function.frag
+@@ -8,7 +8,14 @@ $PROCESS$
+
+ void main(void)
+ {
+- float d = fract(gl_FragCoord.x * gl_FragCoord.y * 0.0001);
++#ifdef GL_FRAGMENT_PRECISION_HIGH
++ // should be declared highp since the multiplication can overflow in
++ // mediump, particularly if mediump is implemented as fp16
++ highp vec2 FragCoord = gl_FragCoord.xy;
++#else
++ vec2 FragCoord = gl_FragCoord.xy;
++#endif
++ float d = fract(FragCoord.x * FragCoord.y * 0.0001);
+
+ $MAIN$
+
+diff --git a/data/shaders/loop.frag b/data/shaders/loop.frag
+index 31ae23e..9a6afd2 100644
+--- a/data/shaders/loop.frag
++++ b/data/shaders/loop.frag
+@@ -3,7 +3,14 @@ uniform int FragmentLoops;
+
+ void main(void)
+ {
+- float d = fract(gl_FragCoord.x * gl_FragCoord.y * 0.0001);
++#ifdef GL_FRAGMENT_PRECISION_HIGH
++ // should be declared highp since the multiplication can overflow in
++ // mediump, particularly if mediump is implemented as fp16
++ highp vec2 FragCoord = gl_FragCoord.xy;
++#else
++ vec2 FragCoord = gl_FragCoord.xy;
++#endif
++ float d = fract(FragCoord.x * FragCoord.y * 0.0001);
+
+ $MAIN$
+
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
index 44bce9fb5f..a5872f4354 100644
--- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
+++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
@@ -17,6 +17,7 @@ SRC_URI = " \
git://github.com/glmark2/glmark2.git;protocol=https \
file://0001-fix-dispmanx-build.patch \
file://0002-run-dispmanx-fullscreen.patch \
+ file://0003-fix-precision-handling-bugs.patch \
"
SRCREV = "784aca755a469b144acf3cae180b6e613b7b057a"