revno: 127
tags: 2011.08
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Fri 2011-08-19 00:31:25 +0300
message:
Add custom dist command to the build system that preserves symbolic links.
------------------------------------------------------------
revno: 126
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2011-08-18 18:36:14 +0300
message:
Update files for 2011.08 release.
------------------------------------------------------------
revno: 125 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2011-08-18 18:19:08 +0300
message:
Merge pulsar scene.
------------------------------------------------------------
revno: 117.1.14
committer: Alexandros Frantzis <email address hidden>
branch nick: pulsar
timestamp: Thu 2011-08-18 18:03:40 +0300
message:
Move the pulsar benchmark before the shader features benchmarks.
------------------------------------------------------------
revno: 117.1.13
committer: Alexandros Frantzis <email address hidden>
branch nick: pulsar
timestamp: Thu 2011-08-18 16:43:31 +0300
message:
Make the rotations speeds non-random by default.
Random rotations speeds look nice, but don't allow us to get reproducible
results across benchmark runs.
------------------------------------------------------------
revno: 117.1.12
committer: Alexandros Frantzis <email address hidden>
branch nick: pulsar
timestamp: Thu 2011-08-18 16:20:04 +0300
message:
Move mesh creation to ::setup() and adjust the vertex format according to the options.
------------------------------------------------------------
revno: 117.1.11
committer: Alexandros Frantzis <email address hidden>
branch nick: pulsar
timestamp: Thu 2011-08-18 15:20:45 +0300
message:
Register pulsar Scene in the glmark2 for android.
------------------------------------------------------------
revno: 117.1.10
committer: Marc Ordinas i Llopis <email address hidden>
branch nick: pulsar
timestamp: Thu 2011-08-18 13:47:37 +0200
message:
Moved enabling of GL options to ::setup()/::teardown().
------------------------------------------------------------
revno: 117.1.9 [merge]
committer: Marc Ordinas i Llopis <email address hidden>
branch nick: pulsar
timestamp: Wed 2011-08-17 19:03:17 +0200
message:
Merged trunk.
------------------------------------------------------------
revno: 117.1.8
committer: Marc Ordinas i Llopis <email address hidden>
branch nick: pulsar
timestamp: Wed 2011-08-17 19:01:31 +0200
message:
Moved option-dependent configuration to ::setup()/::teardown.
Initialize mTexture in all code paths.
Fixed style errors.
------------------------------------------------------------
revno: 117.1.7
committer: Marc Ordinas i Llopis <email address hidden>
branch nick: pulsar
timestamp: Wed 2011-08-17 11:21:24 +0200
message:
Add lighting.
------------------------------------------------------------
revno: 117.1.6
committer: Marc Ordinas i Llopis <email address hidden>
branch nick: pulsar
timestamp: Tue 2011-08-16 17:08:01 +0200
message:
Add option for textured rendering.
------------------------------------------------------------
revno: 117.1.5 [merge]
committer: Marc Ordinas i Llopis <email address hidden>
branch nick: pulsar
timestamp: Tue 2011-08-16 16:29:57 +0200
message:
Merging trunk.
------------------------------------------------------------
revno: 117.1.4 [merge]
committer: Marc Ordinas i Llopis <email address hidden>
branch nick: screensaver
timestamp: Fri 2011-08-12 18:33:52 +0200
message:
Merge from trunk.
------------------------------------------------------------
revno: 117.1.3
committer: Marc Ordinas i Llopis <email address hidden>
branch nick: screensaver
timestamp: Thu 2011-08-11 17:28:03 +0200
message:
Enable alpha blending.
Adjust scale.
------------------------------------------------------------
revno: 117.1.2
committer: Marc Ordinas i Llopis <email address hidden>
branch nick: screensaver
timestamp: Thu 2011-08-11 17:03:54 +0200
message:
Add option to specify number of quads.
Fine-tune rotation and scale to look more similar to original pulsar.
------------------------------------------------------------
revno: 117.1.1
committer: Marc Ordinas i Llopis <email address hidden>
branch nick: screensaver
timestamp: Thu 2011-08-11 12:43:16 +0200
message:
Start of the pulsar xscreensaver port to glmark2.
------------------------------------------------------------
revno: 124
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Wed 2011-08-17 12:10:47 +0300
message:
Properly initialize SceneBump object variables.
------------------------------------------------------------
revno: 123 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2011-08-16 16:18:21 +0300
message:
Merge Android port.
------------------------------------------------------------
revno: 120.1.30
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Tue 2011-08-16 16:10:09 +0300
message:
Log OpenGL(ES) information when starting glmark2 on Android.
------------------------------------------------------------
revno: 120.1.29
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Tue 2011-08-16 16:02:06 +0300
message:
Add instructions for building using the Android build system.
------------------------------------------------------------
revno: 120.1.28
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Tue 2011-08-16 15:33:21 +0300
message:
Add makefiles for the Android build system.
------------------------------------------------------------
revno: 120.1.27
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Tue 2011-08-16 15:22:17 +0300
message:
Don't use LOCAL_EXPORT_C_INCLUDES in NDK Makefile.
This is done just to reduce the diff from the available features in the
Android build system.
------------------------------------------------------------
revno: 120.1.26
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Tue 2011-08-16 14:53:58 +0300
message:
Don't link explicitly with libm.
The NDK build system links with libm automatically.
------------------------------------------------------------
revno: 120.1.25
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Tue 2011-08-16 14:53:03 +0300
message:
Improve module names.
Use module name with a better chance of being unique. Also prefix all module
names with 'lib', to reduce the diff from the conventions used by the Android
build system (this is fine for NDK builds, too).
------------------------------------------------------------
revno: 120.1.24
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Tue 2011-08-16 14:31:27 +0300
message:
Use LOCAL_CFLAGS instead of LOCAL_CPPFLAGS in NDK makefile.
In NDK versions >1.5_r1 (which is quite old now) LOCAL_CFLAGS is also used for
C++ sources, in order to match the convention used by the Android build system.
------------------------------------------------------------
revno: 120.1.23
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Tue 2011-08-16 13:04:02 +0300
message:
Rename jni/Android.mk to jni/Android.ndk.mk.
The Android build system also uses Android.mk files for building. Rename the
Android.mk NDK build file to Android.ndk.mk in order to allow builds using
both systems.
------------------------------------------------------------
revno: 120.1.22
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Tue 2011-08-16 11:28:39 +0300
message:
Don't explicitly set ANDROID preprocessor define during build.
The ANDROID preprocessor define is automatically set by the Android build
system/NDK.
------------------------------------------------------------
revno: 120.1.21
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Tue 2011-08-16 11:16:55 +0300
message:
Implement strict JNI_OnLoad() to make Dalvik happy (Jim Huang).
------------------------------------------------------------
revno: 120.1.20
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Tue 2011-08-16 10:53:59 +0300
message:
Make glmark2 code compatible with stlport and use it for NDK builds.
------------------------------------------------------------
revno: 120.1.19
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Tue 2011-08-16 10:50:49 +0300
message:
Make exceptions optional in libmatrix/mat.h.
------------------------------------------------------------
revno: 120.1.18
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Tue 2011-08-16 10:37:52 +0300
message:
Use virtual destructors for Canvas and Scene base classes.
------------------------------------------------------------
revno: 120.1.17
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Fri 2011-08-12 15:46:19 +0300
message:
Add build instructions for Android.
------------------------------------------------------------
revno: 120.1.16
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Fri 2011-08-12 14:43:27 +0300
message:
Fix typo in src/wscript_build.
------------------------------------------------------------
revno: 120.1.15
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Fri 2011-08-12 14:07:52 +0300
message:
Add LOCAL_MODULE_TAGS for glmark2-android.
------------------------------------------------------------
revno: 120.1.14
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Fri 2011-08-12 13:34:06 +0300
message:
Name the app 'GLMark2' instead of 'Glmark2'.
------------------------------------------------------------
revno: 120.1.13
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Fri 2011-08-12 13:18:18 +0300
message:
Rename the native glmark2 library to glmark2-android.
------------------------------------------------------------
revno: 120.1.12
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Fri 2011-08-12 13:15:46 +0300
message:
Use the default EGLConfig and surface type (probably RGB565, depth=16).
We can add an option for using RGBA8888, if/when we have a gui launcher for
glmark2-android.
------------------------------------------------------------
revno: 120.1.11
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Fri 2011-08-12 12:55:31 +0300
message:
Remove unused package import.
------------------------------------------------------------
revno: 120.1.10
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Fri 2011-08-12 12:52:14 +0300
message:
Restructure android/jni to remove Android specific makefiles from native src directory.
------------------------------------------------------------
revno: 120.1.9
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Wed 2011-08-10 23:48:56 +0300
message:
Add AndroidManifest.xml and directory structure needed for android application build.
------------------------------------------------------------
revno: 120.1.8
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Wed 2011-08-10 23:29:38 +0300
message:
Add android source code for glmark2 application.
------------------------------------------------------------
revno: 120.1.7
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Wed 2011-08-10 23:18:30 +0300
message:
Add android native makefiles and directory structure needed for NDK builds.
------------------------------------------------------------
revno: 120.1.6
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Wed 2011-08-10 22:48:46 +0300
message:
Add source file implementing the JNI interface to use for the android port.
------------------------------------------------------------
revno: 120.1.5
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Wed 2011-08-10 21:00:03 +0300
message:
Add a simple canvas for android.
------------------------------------------------------------
revno: 120.1.4
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Wed 2011-08-10 20:58:47 +0300
message:
Add android support to Util class (resource loading).
------------------------------------------------------------
revno: 120.1.3
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Wed 2011-08-10 20:57:38 +0300
message:
Add android support to Log class.
------------------------------------------------------------
revno: 120.1.2
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Wed 2011-08-10 20:55:38 +0300
message:
Replace GLchar with char to allow building on systems having older GL header files.
------------------------------------------------------------
revno: 120.1.1
committer: Alexandros Frantzis <email address hidden>
branch nick: android
timestamp: Wed 2011-08-10 20:54:32 +0300
message:
Add libpng source code, needed for Android build.
------------------------------------------------------------
revno: 122
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2011-08-11 11:57:47 +0300
message:
Remove useless statement from SceneGrid::setup().
The mProgram object hasn't been initialized at this point, so there is no point
using it to get the index of a vertex attribute. The attrib locations for
the mMesh object are set by the ::setup() method in the classes inheriting
from SceneGrid.
------------------------------------------------------------
revno: 121
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2011-08-11 11:42:00 +0300
message:
Make GL_CLAMP_TO_EDGE the default texture wrap mode.
GLES2 drivers that don't support GL_OES_texture_npot only allow GL_CLAMP_TO_EDGE
as a texture wrap mode.
------------------------------------------------------------
revno: 120 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Wed 2011-08-10 16:56:41 +0300
message:
Access resources in an abstract way using std::istream.
------------------------------------------------------------
revno: 119.1.4
committer: Alexandros Frantzis <email address hidden>
branch nick: resource
timestamp: Wed 2011-08-10 16:53:02 +0300
message:
Use Util::get_resource() to read shader source files.
------------------------------------------------------------
revno: 119.1.3
committer: Alexandros Frantzis <email address hidden>
branch nick: resource
timestamp: Wed 2011-08-10 16:52:40 +0300
message:
Use Util::get_resource() to read texture PNG files.
------------------------------------------------------------
revno: 119.1.2
committer: Alexandros Frantzis <email address hidden>
branch nick: resource
timestamp: Wed 2011-08-10 16:52:04 +0300
message:
Use Util::get_resource() to read model files.
------------------------------------------------------------
revno: 119.1.1
committer: Alexandros Frantzis <email address hidden>
branch nick: resource
timestamp: Wed 2011-08-10 16:32:04 +0300
message:
Add Util::get_resource(), to get a resource as a std::istream.
------------------------------------------------------------
revno: 119 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2011-08-09 16:13:04 +0300
message:
Add support for setting the size of the drawing area.
------------------------------------------------------------
revno: 118.1.3
committer: Alexandros Frantzis <email address hidden>
branch nick: resize
timestamp: Tue 2011-08-09 14:21:35 +0300
message:
Take the width and height from the canvas, don't assume 800x600.
------------------------------------------------------------
revno: 118.1.2
committer: Alexandros Frantzis <email address hidden>
branch nick: resize
timestamp: Tue 2011-08-09 14:13:43 +0300
message:
Add --size command line option.
------------------------------------------------------------
revno: 118.1.1
committer: Alexandros Frantzis <email address hidden>
branch nick: resize
timestamp: Tue 2011-08-09 13:51:03 +0300
message:
Add Canvas::resize() method.
------------------------------------------------------------
revno: 118
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2011-08-09 13:34:49 +0300
message:
Move the string split() function to a separate Util module.
------------------------------------------------------------
revno: 117
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2011-08-04 15:21:27 +0100
message:
Average all the individual FPS values to calculate the final score.
------------------------------------------------------------
revno: 116
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2011-08-02 17:01:29 +0100
message:
Fix compilation warning/error about uninitialized variables.
------------------------------------------------------------
revno: 115 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2011-08-02 15:40:55 +0100
message:
Implement a benchmarking scene for GPU-based 2D image filtering.
------------------------------------------------------------
revno: 114.1.8
committer: Alexandros Frantzis <email address hidden>
branch nick: scene-effect-2d
timestamp: Tue 2011-08-02 15:29:51 +0100
message:
Add some default tests based on SceneEffect2D.
------------------------------------------------------------
revno: 114.1.7
committer: Alexandros Frantzis <email address hidden>
branch nick: scene-effect-2d
timestamp: Tue 2011-08-02 15:28:18 +0100
message:
Use "kernel" instead of the more generic "filter" in the code.
------------------------------------------------------------
revno: 114.1.6
committer: Alexandros Frantzis <email address hidden>
branch nick: scene-effect-2d
timestamp: Tue 2011-08-02 14:34:32 +0100
message:
Print out the normalized kernel in debugging mode.
------------------------------------------------------------
revno: 114.1.5
committer: Alexandros Frantzis <email address hidden>
branch nick: scene-effect-2d
timestamp: Tue 2011-08-02 12:29:25 +0100
message:
Use "effect2d" instead of a "effect" as SceneEffect2D id.
------------------------------------------------------------
revno: 114.1.4
committer: Alexandros Frantzis <email address hidden>
branch nick: scene-effect-2d
timestamp: Mon 2011-08-01 17:44:19 +0100
message:
Normalize the convolution matrix by default and add an option to turn off normalization.
------------------------------------------------------------
revno: 114.1.3
committer: Alexandros Frantzis <email address hidden>
branch nick: scene-effect-2d
timestamp: Mon 2011-08-01 17:01:36 +0100
message:
Add option to SceneEffect2D for specifying the convolution matrix/kernel/filter to use.
------------------------------------------------------------
revno: 114.1.2
committer: Alexandros Frantzis <email address hidden>
branch nick: scene-effect-2d
timestamp: Thu 2011-07-28 17:06:56 +0300
message:
Add basic structure of 2D effect scene.
------------------------------------------------------------
revno: 114.1.1
committer: Alexandros Frantzis <email address hidden>
branch nick: scene-effect-2d
timestamp: Thu 2011-07-28 11:44:31 +0300
message:
Refactor ShaderSource to allow adding statements both at global and local (function) scope.
------------------------------------------------------------
revno: 114 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Wed 2011-07-27 18:10:48 +0300
message:
Implement ShaderSource object and use it to clean up shader source initialization.
------------------------------------------------------------
revno: 113.1.3
committer: Alexandros Frantzis <email address hidden>
branch nick: shader-source
timestamp: Wed 2011-07-27 18:03:54 +0300
message:
Use ShaderSource object to simplify complex shader creation.
------------------------------------------------------------
revno: 113.1.2
committer: Alexandros Frantzis <email address hidden>
branch nick: shader-source
timestamp: Wed 2011-07-27 18:02:27 +0300
message:
Remove unneeded uniforms in shaders by replacing them with runtime configurable constants.
------------------------------------------------------------
revno: 113.1.1
committer: Alexandros Frantzis <email address hidden>
branch nick: shader-source
timestamp: Wed 2011-07-27 17:43:40 +0300
message:
Add ShaderSource object for loading and manipulating shader sources.
