revno: 159
tags: 2011.10
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2011-10-18 16:40:39 +0300
message:
Build,Doc: Update files for 2011.10 release.
------------------------------------------------------------
revno: 158
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2011-10-18 16:40:12 +0300
message:
SceneBuild: Remove forgotten test code.
This code was erroneously commited while testing the buffer update functionality.
------------------------------------------------------------
revno: 157
author: Jesse Barker <email address hidden>
committer: Alexandros Frantzis <email address hidden>
branch nick: shading-models
timestamp: Mon 2011-10-17 15:56:15 -0700
message:
SceneShading: update to reflect the recent changes to SceneBuild. Enables the
selection of additional models, including the optional large models.
------------------------------------------------------------
revno: 156
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Mon 2011-10-17 13:13:12 +0300
message:
Android: Display glmark2 version in logs.
------------------------------------------------------------
revno: 155 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2011-10-13 18:59:20 +0300
message:
SceneDesktop: Add drop shadow effect.
------------------------------------------------------------
revno: 151.1.3
committer: Alexandros Frantzis <email address hidden>
branch nick: desktop-shadow
timestamp: Thu 2011-10-13 18:58:38 +0300
message:
Main,Android: Add benchmark for desktop shadow effect to default benchmarks.
------------------------------------------------------------
revno: 151.1.2
committer: Alexandros Frantzis <email address hidden>
branch nick: desktop-shadow
timestamp: Thu 2011-10-13 15:20:03 +0300
message:
SceneDesktop: Add drop shadow effect.
------------------------------------------------------------
revno: 151.1.1
committer: Alexandros Frantzis <email address hidden>
branch nick: desktop-shadow
timestamp: Thu 2011-10-13 15:17:33 +0300
message:
SceneDesktop: Add support for rotated rendering of RenderObjects.
------------------------------------------------------------
revno: 154 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2011-10-13 17:00:10 +0300
message:
Android,Model: Fix model listing and discovery on Android.
------------------------------------------------------------
revno: 153.1.4
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2011-10-13 16:56:26 +0300
message:
Model,Android: Move ModelPrivate::list_files() to Util and provide Android version.
------------------------------------------------------------
revno: 153.1.3
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2011-10-13 16:44:52 +0300
message:
Android: Set the AssetManager at the very beginning of native initialization.
Some operations during initialization may need to access the AssetManager.
------------------------------------------------------------
revno: 153.1.2
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2011-10-13 16:43:10 +0300
message:
Util: Only remove a leading '/' from a path name if it is actually there.
------------------------------------------------------------
revno: 153.1.1
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2011-10-13 16:41:01 +0300
message:
Util: Add method to get the Android asset manager.
------------------------------------------------------------
revno: 153
author: Jim Huang <jserv@0xlab.org>
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2011-10-13 15:45:49 +0300
message:
Android: Don't accept sensor events to avoid screen rotation
glmark2 doesn't currently support dynamic screen resizing.
------------------------------------------------------------
revno: 152
author: Jim Huang <jserv@0xlab.org>
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2011-10-13 15:43:55 +0300
message:
Android: Acquire WakeLock to prevent dim screen
------------------------------------------------------------
revno: 151
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2011-10-11 12:51:17 +0300
message:
Shaders: Convert all shader files to unix file format (LF line endings).
------------------------------------------------------------
revno: 150 [merge]
author: Jesse Barker <email address hidden>
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2011-10-11 12:46:59 +0300
message:
Model: Add support for glmark2-extras and handle model loading more cleanly.
The addition of support for the optional additional large models begged a
slight revamp of the handling of models in general. Included in this branch:
- Addition of a "--extras-path" option to the configure phase of the build.
This enables the inclusion of optional data from a non-default location (e.g.,
in a situation where a developer wants temporary access to the data without
tainting their installation).
- Model class gets a class method called "find_models()" to scan both the "data
path" as well as the "extras path" (if configured). This method builds a
database of available models in the form of a std::map with the model "name"
(filename with no extension) as key and a pointer to a new ModelDescriptor
object as value. ModelDescriptor contains the model name, format (3ds, obj),
and full pathname to the model file.
- Model class gets a new object method called "load()". This takes only the
model name (as described above), and uses the map to look up the additional
details it needs to load the model without the calling scene needing to know
anything about the format of the model. The format-specific load methods are
now private and all calling scenes have been updated to call the new method.
- Model class gets updated with some additional comments to clarify what has
been done and how the object is meant to be used.
------------------------------------------------------------
revno: 148.2.8
committer: Jesse Barker <email address hidden>
branch nick: extra-support
timestamp: Fri 2011-10-07 11:39:57 -0700
message:
Add some helpful comments to the model object now that things have changed a bit.
------------------------------------------------------------
revno: 148.2.7
committer: Jesse Barker <email address hidden>
branch nick: extra-support
timestamp: Fri 2011-10-07 11:36:56 -0700
message:
Make format-specific load functions private as they are no longer used by any
of the scenes.
------------------------------------------------------------
revno: 148.2.6
committer: Jesse Barker <email address hidden>
branch nick: extra-support
timestamp: Fri 2011-10-07 11:35:47 -0700
message:
Convert the remaining tests to use the load model by name functionality.
------------------------------------------------------------
revno: 148.2.5
committer: Jesse Barker <email address hidden>
branch nick: extra-support
timestamp: Fri 2011-10-07 11:23:14 -0700
message:
Hook up the new model mechanism to the build scene. Other scenes to follow.
------------------------------------------------------------
revno: 148.2.4
committer: Jesse Barker <email address hidden>
branch nick: extra-support
timestamp: Fri 2011-10-07 11:19:11 -0700
message:
Enhance model object to scan models both from the built-in data path as well as
from an extras path if it is so configured. The model module will now generate
and maintain a map of models by name which will allow the model format to be
opaque to the scene that loads it.
------------------------------------------------------------
revno: 148.2.3
committer: Jesse Barker <email address hidden>
branch nick: extra-support
timestamp: Fri 2011-10-07 11:17:20 -0700
message:
Add "--extras-path" option to allow for the extra data form glmark2-extra either
not to be installed or to be installed in a non-standard location.
------------------------------------------------------------
revno: 148.2.2
committer: Jesse Barker <email address hidden>
branch nick: extra-support
timestamp: Fri 2011-10-07 08:34:52 -0700
message:
Revert previous build changes as we don't need most of them.
------------------------------------------------------------
revno: 148.2.1
committer: Jesse Barker <email address hidden>
branch nick: extra-support
timestamp: Thu 2011-10-06 15:43:20 -0700
message:
Add waf configure and install logic for the optional models. Keep the logic
flexible enough that if we add optional shaders or textures later, we're ok.
------------------------------------------------------------
revno: 149 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2011-10-11 12:39:35 +0300
message:
SceneBuffer: New scene to benchmark various aspects of buffer update operations.
SceneBuffer provides various options to control the details of the update
process: whether to use MapBuffer or BufferSubData, how much of the buffer
to update, how dispersed the update ranges are, the buffer usage hint, whether
to use interleaved attribute storage and the size of the grid.
Visually the scene draws a grid modulated by a sine wave. The wave's details
(wavelength, duty-cycle) are affected by some of the options to produce an
interesting visual result. Furthermore, the grid is drawn using a GLSL wireframe
technique which is very interesting in and of itself.
------------------------------------------------------------
revno: 148.1.22
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Tue 2011-10-11 11:52:12 +0300
message:
SceneBuffer: Remove minus sign from 0.0 constants.
------------------------------------------------------------
revno: 148.1.21
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Tue 2011-10-11 11:50:28 +0300
message:
SceneBuffer: Remove unused NormalMatrix calculation.
------------------------------------------------------------
revno: 148.1.20
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Mon 2011-10-10 19:10:04 +0300
message:
Main,Android: Add some default benchmarks based on SceneBuffer.
------------------------------------------------------------
revno: 148.1.19
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Mon 2011-10-10 19:06:49 +0300
message:
SceneBuffer: Fix memory leak.
------------------------------------------------------------
revno: 148.1.18
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Mon 2011-10-10 18:53:51 +0300
message:
Android: Register SceneBuffer.
------------------------------------------------------------
revno: 148.1.17
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Mon 2011-10-10 18:45:27 +0300
message:
SceneBuffer: Correctly update vertices belonging to the last length index.
------------------------------------------------------------
revno: 148.1.16
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Mon 2011-10-10 17:06:22 +0300
message:
Mesh: Ensure buffer_usage is always set.
------------------------------------------------------------
revno: 148.1.15
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Mon 2011-10-10 17:02:17 +0300
message:
SceneBuffer: Build the VBO after setting the options to ensure that they take effect properly.
------------------------------------------------------------
revno: 148.1.14
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Mon 2011-10-10 17:01:27 +0300
message:
SceneBuffer: Add buffer-usage scene option.
------------------------------------------------------------
revno: 148.1.13
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Mon 2011-10-10 16:55:46 +0300
message:
Mesh: Add support for setting the VBO usage hint.
------------------------------------------------------------
revno: 148.1.12
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Mon 2011-10-10 14:02:03 +0300
message:
SceneBuffer: Check that the gl(Map|Unmap)Buffer functions are supported when using Map VBO update method.
------------------------------------------------------------
revno: 148.1.11
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Mon 2011-10-10 14:00:36 +0300
message:
Canvas*,Mesh: Set up and access GL extension functions through function pointers.
------------------------------------------------------------
revno: 148.1.10
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Sat 2011-10-08 15:31:31 +0300
message:
SceneBuffer: Make the wireframe line thinner for better visual results.
------------------------------------------------------------
revno: 148.1.9
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Sat 2011-10-08 15:30:54 +0300
message:
SceneBuffer: Use a grid mesh modulated by a sine wave instead of transformable objects.
------------------------------------------------------------
revno: 148.1.8
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Sat 2011-10-08 15:30:21 +0300
message:
Mesh: Make the callback function of ::make_grid more versatile.
------------------------------------------------------------
revno: 148.1.7
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Thu 2011-10-06 16:14:59 +0300
message:
SceneBuffer: Draw using translucency.
------------------------------------------------------------
revno: 148.1.6
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Thu 2011-10-06 16:11:25 +0300
message:
SceneBuffer: Use a 3D transformable cube model.
------------------------------------------------------------
revno: 148.1.5
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Wed 2011-10-05 19:42:33 +0300
message:
SceneBuffer: Draw using a wireframe.
------------------------------------------------------------
revno: 148.1.4
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Tue 2011-10-04 18:53:47 +0300
message:
SceneBuffer: Initial implementation.
This commit introduces an initial implementation of the buffer scene along
with the infrastructure for creating complex transformable objects.
------------------------------------------------------------
revno: 148.1.3
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-update
timestamp: Mon 2011-10-03 14:40:44 +0300
message:
Mesh: Add method to provide access to the mesh vertices.
------------------------------------------------------------
revno: 148.1.2
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-upload
timestamp: Mon 2011-10-03 14:26:04 +0300
message:
Mesh: Add support for updating the data of vertex array and VBO ranges.
This commits adds two supported update methods for VBOs: glMapBuffer() and
glBufferSubData(). The method to use is set with Mesh::vbo_update_method().
------------------------------------------------------------
revno: 148.1.1
committer: Alexandros Frantzis <email address hidden>
branch nick: buffer-upload
timestamp: Fri 2011-09-30 17:33:00 +0300
message:
Mesh: Make the attribute interleaving option part of the object state.
------------------------------------------------------------
revno: 148
fixes bug(s): https://launchpad.net/bugs/842279
committer: Alexandros Frantzis <email address hidden>
branch nick: lp-842279
timestamp: Thu 2011-09-29 16:05:21 +0300
message:
CanvasX11: Check GL version string to ensure that OpenGL(ES) 2.0 is really supported.
When running glmark2 on older hardware (OpenGL 1.x compatible) leads to a
crash. This commit checks that OpenGL(ES) 2.0 is really supported before
trying to execute any OpenGL(ES) 2.0 only code and fails gracefully if it's not
supported (LP #842279).
------------------------------------------------------------
revno: 147
fixes bug(s): https://launchpad.net/bugs/851334
committer: Alexandros Frantzis <email address hidden>
branch nick: lp-851334
timestamp: Wed 2011-09-28 18:48:47 +0300
message:
Android: Use a custom EGLConfigChooser that gracefully handles eglChooseConfig failures.
When proper GLES2.0 drivers are missing from an Android device,
eglChooseConfig() will fail to find a GLES2.0 capable config, as expected.
Unfortunately, the default EGLConfigChooser implementation doesn't give us a
chance to handle this error; it throws an exception that we cannot catch
(because it comes from an internal thread) and crashes the application.
In order to handle the error gracefully, this commit introduces a custom
EGLConfigChooser implementation that in case of error displays an informative
alert and then quits the application.
