=== modified file 'NEWS'
@@ -1,3 +1,13 @@
+glmark2 2011.10 (20111018)
+==========================
+
+* Add benchmark for buffer (VBO) updates.
+* Add benchmark for drop-shadow desktop effect.
+* Add support for glmark2 extra large models.
+* Enable the selection of additional models in the shading benchmark.
+* Gracefully handle unsupported OpenGL versions, on both X11 and Android.
+* Disable screen dimming and screen rotation on Android.
+
glmark2 2011.09 (20110921)
==========================
=== modified file 'android/AndroidManifest.xml'
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="1"
- android:versionName="2011.08" package="org.linaro.glmark2">
+ android:versionName="2011.10" package="org.linaro.glmark2">
<application android:label="@string/app_name">
<activity android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
=== modified file 'android/jni/Android.mk'
@@ -27,7 +27,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libglmark2-android
LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png
-LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.09\""
+LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.10\""
LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport
LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
$(LOCAL_PATH)/src/libmatrix \
=== modified file 'android/jni/Android.ndk.mk'
@@ -23,7 +23,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libglmark2-android
LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png
-LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.09\""
+LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.10\""
LOCAL_LDLIBS := -landroid -llog -lGLESv2 -lEGL -lz
LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
$(LOCAL_PATH)/src/libmatrix \
=== modified file 'doc/glmark2.1.in'
@@ -1,4 +1,4 @@
-.TH @APPNAME@ "1" "September 2011" "@appname@ @appversion@"
+.TH @APPNAME@ "1" "October 2011" "@appname@ @appversion@"
.SH NAME
@appname@ \- OpenGL (ES) 2.0 benchmark suite
.SH SYNOPSIS
=== modified file 'wscript'
@@ -8,7 +8,7 @@
out = 'build'
top = '.'
-VERSION = '2011.09'
+VERSION = '2011.10'
APPNAME = 'glmark2'
def options(opt):