Skip to content

Commit 42e3d8f

Browse files
committed
Build,Doc: Update files for 2023.01 release
1 parent b48eda4 commit 42e3d8f

File tree

8 files changed

+31
-6
lines changed

8 files changed

+31
-6
lines changed

NEWS

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
glmark2 2023.01 (20230119)
2+
==========================
3+
4+
* Add gbm-gl/glesv2 flavors for GBM offscreen rendering.
5+
* Add x11-gl-egl flavor that uses EGL under X11.
6+
* Implement SwapInterval 0 for the DRM backend.
7+
* Support multisampled configs in --visual-config.
8+
* Support explicitly specifying the config id in --visual-config.
9+
* Add CPU time and shader compilation time to available results.
10+
* Add --results to specify which kind of results to report.
11+
* Add --results-file to export results to XML or CSV.
12+
* Add --version command-line option.
13+
114
glmark2 2021.12 (20211223)
215
==========================
316

android/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
android:versionCode="1"
4-
android:versionName="2021.12" package="org.linaro.glmark2">
4+
android:versionName="2023.01" package="org.linaro.glmark2">
55
<application android:icon="@mipmap/ic_launcher"
66
android:label="@string/app_name"
77
android:roundIcon="@mipmap/ic_launcher_round">

android/jni/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ include $(CLEAR_VARS)
5454
LOCAL_MODULE_TAGS := optional
5555
LOCAL_MODULE := libglmark2-android
5656
LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas libglmark2-jpeg
57-
LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2021.12\"" \
57+
LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2023.01\"" \
5858
-DGLMARK2_USE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
5959
-Wno-error=unused-parameter
6060
LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport

android/jni/Android.ndk.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ include $(CLEAR_VARS)
102102
LOCAL_MODULE_TAGS := optional
103103
LOCAL_MODULE := libglmark2-android
104104
LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas libglmark2-jpeg libglad-egl libglad-glesv2
105-
LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2021.12\"" \
105+
LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2023.01\"" \
106106
-DGLMARK2_USE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
107107
-Wno-error=unused-parameter
108108
LOCAL_LDLIBS := -landroid -llog -lz

doc/glmark2.1.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH @APPNAME@ "1" "December 2021" "@appname@ @appversion@"
1+
.TH @APPNAME@ "1" "January 2023" "@appname@ @appversion@"
22
.SH NAME
33
@appname@ \- OpenGL (ES) 2.0 benchmark suite
44
.SH SYNOPSIS
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
glmark2 2023.01 (20230119)
2+
==========================
3+
4+
* Add gbm-gl/glesv2 flavors for GBM offscreen rendering.
5+
* Add x11-gl-egl flavor that uses EGL under X11.
6+
* Implement SwapInterval 0 for the DRM backend.
7+
* Support multisampled configs in --visual-config.
8+
* Support explicitly specifying the config id in --visual-config.
9+
* Add CPU time and shader compilation time to available results.
10+
* Add --results to specify which kind of results to report.
11+
* Add --results-file to export results to XML or CSV.
12+
* Add --version command-line option.

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ project(
22
'glmark2',
33
['cpp', 'c'],
44
default_options : ['cpp_std=c++14'],
5-
version : '2021.12',
5+
version : '2023.01',
66
meson_version: '>=0.47'
77
)
88

wscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ from waflib import Context
44
out = 'build'
55
top = '.'
66

7-
VERSION = '2021.12'
7+
VERSION = '2023.01'
88
APPNAME = 'glmark2'
99

1010
FLAVORS = {

0 commit comments

Comments
 (0)