Commit Graph

41 Commits

Author SHA1 Message Date
Randolph Sapp 658408c2a0 glmark2: add upstream patch to not care about stencil config
The upstream project already patched this, but considering this package
is currently locked to the latest tag, I'll add it here.

This fixes an issue with stencil configs being scored unnecessarily low.
It also addresses a problem when the target config is below 0.

Signed-off-by: Randolph Sapp <rs@ti.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2024-03-05 15:09:25 -08:00
Fabio Estevam a9b2d1303b glmark2: Update to 2023.01
Update to the 2023.01 version:

glmark2 2023.01 (20230119)
==========================

* Add gbm-gl/glesv2 flavors for GBM offscreen rendering.
* Add x11-gl-egl flavor that uses EGL under X11.
* Implement SwapInterval 0 for the DRM backend.
* Support multisampled configs in --visual-config.
* Support explicitly specifying the config id in --visual-config.
* Add CPU time and shader compilation time to available results.
* Add --results to specify which kind of results to report.
* Add --results-file to export results to XML or CSV.
* Add --version command-line option.

Remove 0001-libmatrix-Include-missing-utility-header.patch, which has been
upstreamed and refresh 0002-run-dispmanx-fullscreen.patch to avoid
fuzz warnings.

Signed-off-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-02-27 13:39:56 -08:00
Andreas Müller ac0b851829 glmark2: Build with meson
Building with waf fails here with:
| /bin/sh: line 1: /usr/bin/wayland-scanner: No such file or directory
|
| /bin/sh: line 1: /usr/bin/wayland-scanner: No such file or directory

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2022-07-11 22:46:17 +01:00
Martin Jansa 274af1c051 glmark2: fix compatibility with python-3.11
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2022-06-30 13:39:28 -04:00
Khem Raj 4cde452b19 glmark2: Fix build with gcc12
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2022-04-13 19:21:41 -07:00
Khem Raj 14c7d8a0d7 recipes: Update LICENSE variable to use SPDX license identifiers
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2022-03-04 17:41:45 -08:00
zhengruoqin 05d313acb1 glmark2: upgrade 2021.02 -> 2021.12
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-12-27 11:46:41 -08:00
Richard Purdie b402a3076f recipes: Update SRC_URI branch and protocols
This patch updates SRC_URIs using git to include branch=master if no branch is set
and also to use protocol=https for github urls as generated by the conversion script
in OE-Core.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-11-03 06:57:49 -07:00
Martin Jansa c61dc077bb Convert to new override syntax
This is the result of automated script (0.9.1) conversion:

oe-core/scripts/contrib/convert-overrides.py .

converting the metadata to use ":" as the override character instead of "_".

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-08-03 10:21:25 -07:00
Denys Dmytriyenko 3c41c25774 glmark2: also depend on wayland-protocols when wayland distro feature is on
Fixes this:
| Checking for 'libpng12'                  : not found
| Checking for 'libpng15'                  : not found
| Checking for 'libpng16'                  : yes
| Checking for 'x11'                       : not found
| Checking for 'libdrm'                    : yes
| Checking for 'gbm'                       : yes
| Checking for 'libudev'                   : yes
| Checking for 'mirclient'                 : not found
| Checking for 'wayland-client'            : yes
| Checking for 'wayland-cursor'            : yes
| Checking for 'wayland-egl'               : yes
| Checking for 'wayland-protocols'         : not found
| The configuration failed

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-03-28 12:12:58 -07:00
zhengruoqin f89473d972 glmark2: upgrade 20201114 -> 2021.02
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-03-19 01:19:14 -07:00
Trevor Woerner 9f76cb0f18 glmark2: fix precision handling bugs
This patch comes from Alyssa Rosenzweig and fixes/clarifies glmark2's
handling of fp16 overflows which result in corrupted rendering on some
drivers.

See: https://github.com/glmark2/glmark2/pull/132

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-12-18 12:17:38 -08:00
Trevor Woerner 936f2380bb glmark2: revert to previous behaviour
- use "drm-gles2" as the default PACKAGECONFIG outside of any defined
  DISTRO_FEATURES
- use a version string that includes the full date of the latest git change
  (not just: <year>.<month>)

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-12-10 22:33:58 -08:00
Trevor Woerner 9fe11cc8a9 glmark2: add support for dispmanx
Upstream glmark2 includes support for running glmark2 on a RaspberryPi via the
dispmanx interface, as is provided by "userland".

The build depends on x11, but this is a quirk of the upstream sources. One
can easily build a minimal image without any x11/wayland on which to run
dispmanx applications directly (including glmark2).

NOTE: unlike with other flavours, one can only build the dispmanx-eglv2
      flavour on its own (this is a constraint of the glmark2 build)

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-12-03 22:32:56 -08:00
Trevor Woerner 5958cfcf99 glmark2: update to latest
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-12-03 22:32:56 -08:00
Trevor Woerner 09008b389d glmark2: update information
According to https://launchpad.net/glmark2 the preferred "home" and bugtracker
for the project are on github.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-12-03 22:32:56 -08:00
Ross Burton 4ba8f6cb21 glmark2: no need to patch waf
Now that waf.bbclass in oe-core uses Python 3 explictly we don't need to
patch glmark.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-10-18 12:45:33 -07:00
Matt Hoosier 482cb703fa glmark2: don't build full OpenGL backends by default
Most embedded GPU's implementations OpenGL include only the OpenGL ES
APIs. Attempting to compile the {x11,wayland,drm}-gl variants of
GLMark fail in those cases.

Signed-off-by: Matt Hoosier <matt.hoosier@garmin.com>
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-07-16 09:53:26 -07:00
Joshua Watt 72d403364c glmark2: Update to latest version
Updates to the most recent version of glmark2. In particular, this fixes
problems where the benchmark would fail to start due to improper
handling of EGL_NO_DISPLAY with EGL 1.5

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-03-10 13:49:35 -07:00
Ross Burton 56101d3e3b glmark2: use Python 3 to build
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-11-26 10:33:56 -08:00
Ross Burton 2c54b53159 glmark2: upgrade to latest HEAD
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-11-26 10:33:56 -08:00
Denys Dmytriyenko 4c00e5fed9 recipes: rename distro_features_check to features_check
Avoid warning due to the class rename in OE-Core.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-11-21 17:51:37 -08:00
Roman Stratiienko 3947b77ac3 glmark2: Upgrade SRCREV to latest
Fixes QA Issue: /usr/bin/glmark2-es2-drm contained in package glmark2 requires
libgbm.so, libEGL.so, libGLESv2.so, but no providers found in RDEPENDS_glmark2.

Fixes missing libraries listed above at runtime in glmark2-es2-drm.

Signed-off-by: Roman Stratiienko <roman.stratiienko@globallogic.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-08-11 08:58:05 -07:00
Ross Burton 7baf5c3636 glmark2: update to current git
Remove two patches merged upstream.  The other patch isn't required so can be
deleted.

Remove explicit --std=c++11 as the wscript adds --std=c++14 now.

Change PV to contain the full date just in case we want to update more than once
a month.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-02-06 08:19:13 -08:00
Martin Jansa db36d53cc5 glmark2: add dependency on virtual/libgbm for drm-gl, drm-gles2 PACKAGECONFIG
* it's checked by wscript for all flavors with drm in it:
  ('gbm','gbm', None, list_contains(ctx.options.flavors, 'drm')),

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-08-19 16:09:28 -07:00
Mark Hatle 1d6b694459 glmark2: Set required distro features to opengl
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2017-09-13 11:08:45 +02:00
Khem Raj ff77141b96 glmark2: Fix build with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-08-31 10:18:32 +02:00
Nicolas Dechesne 04c3bc04cd glmark2: Upgrade to 2017.07 release
Upstream added new dependency on udev in
a7ae55d NativeStateDRM: Probe the DRM node path to use with udev

Patch removed since it was merged upstream in
5fcdba1 wayland: Fix destruction order of surface-related objects

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-08-13 13:20:57 +02:00
Trevor Woerner 1fb8406a9e glmark2: update to latest
Fixes and updates for imx, pl111, and vc4.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-07-01 09:59:25 +02:00
Khem Raj 3566ddf580 glmark2: Update to latest and fix build on pi
when using userland it does not work since it needs
libgbm from mesa.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-05-23 15:49:36 +02:00
Alexander Kanavin a30e0f4cd3 glmark2: depend on modern libpng
libpng 1.2 is being removed from oe-core as it's well obsolete.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-05-23 15:49:35 +02:00
Joshua Lock efd3696e70 remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.

Search made with the following regex: getVar ?\(( ?[^,()]*), True\)

Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
2016-12-02 09:16:17 +01:00
Andreas Müller 913d1ea5d1 glmark: update to latest sources
With mesa 13.0.0 glmark-es2 crashed at the terrain part. This bug was fixed in
the latest commit. See further details at [1].

[1] https://github.com/glmark2/glmark2/issues/25

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-11-22 13:38:30 +01:00
Amarnath Valluri b09611969a glmark2: Enabling c++ 11 features
When build with gcc5,  Failed with below errors:
| ../src/image-reader.cpp: In member function 'bool PNGReader::init(const
string&)':
| ../src/image-reader.cpp:123:16: error: 'unique_ptr' in namespace 'std' does
not name a template type

This change explicitly enables c++11 features, as code using them.

Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-10-26 10:28:40 +02:00
Otavio Salvador c0e0c77970 glmark2: Fix build error due a missing space before a macro
This fixes following error:

../src/native-state-x11.cpp:63:33: error: invalid suffix on literal; C++11 requires a space between literal and string macro [-Werror=literal-suffix]
     static const char *win_name("glmark2 "GLMARK_VERSION);

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-09-11 09:11:21 +02:00
Tom Hochstein 98c0577972 glmark2: Fix gcc 6 deprecated declaration error
Replace auto_ptr with unique_ptr.

Upstream-Status: Pending

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-08-15 12:31:57 +02:00
Tom Hochstein c29c7ed764 glmark2: Fix gcc 6 configure error
Remove the un-necessary check for sqrt and avoid a gcc 6 configure error.

Upstream-Status: Submitted [Pull request: a39907dd19726b2df3bac29a4bdc59d1bd0922a1]

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-08-15 12:31:57 +02:00
Martin Jansa 25a78e55e9 abiword, fbreader, tvheadend, glmark2, libqmi, modemmanager, thrift, wvdial, wvstreams, dt, collectd, gtkmathview, tcsh, glcompbench, geos, libspatialite, geis, grail, opencv, openwbem, fwts: blacklist, fails to build with gcc-6 or glibc-2.24
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-06-13 19:06:44 +02:00
Neena Busireddy c7265a61d7 glmark2: wl_surface should be destoryed after destroying wl_window
If wl_surface is destroyed while work thread is still running,
segmentation fault occurs.

Signed-off-by: Neena Busireddy <neenareddy.busireddy@nxp.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:25 +02:00
Otavio Salvador 9806992913 glmark2: Remove X11 exclusiveness
The tool has support for multiple backends: X11, drm and Wayland.

This demanded to a fix, which has been sent upstream, to make the
flavor configuration predictable and the recipe has been rework to
support them all, making the PACKAGECONFIG to respect the
DISTRO_FEATURES available by default.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-07-30 20:20:42 +02:00
Otavio Salvador b0c486f9b7 glmark2: Convert recipe to fetch from Git
The development has been moved for github thus it makes sense to use
this, instead of the tarball.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-07-30 20:20:42 +02:00