revno: 238
tags: 2012.07
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2012-07-19 12:18:25 +0300
message:
Build,Doc: Update files for 2012.07 release.
------------------------------------------------------------
revno: 237
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2012-07-19 12:18:06 +0300
message:
Android: Use string resources for button labels.
This is required when building in-tree.
------------------------------------------------------------
revno: 236
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2012-07-19 11:44:26 +0300
message:
DefaultBenchmarks: Add 'terrain' benchmark.
------------------------------------------------------------
revno: 235
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Wed 2012-07-18 19:10:51 +0300
message:
Android: Ensure that the option list is updated after changing an option using a text entry.
------------------------------------------------------------
revno: 234 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Wed 2012-07-18 19:06:30 +0300
message:
Android: Display a list of acceptable values instead of a text entry for options that have such a list.
------------------------------------------------------------
revno: 233.1.2
committer: Alexandros Frantzis <email address hidden>
branch nick: android-gui-options-finite-value-set
timestamp: Wed 2012-07-18 12:46:21 +0300
message:
Android: Display a list of acceptable values instead of a text entry for options that have such a list.
------------------------------------------------------------
revno: 233.1.1
committer: Alexandros Frantzis <email address hidden>
branch nick: android-gui-options-finite-value-set
timestamp: Wed 2012-07-18 12:45:59 +0300
message:
Android: Make acceptable values of options available to the java code.
------------------------------------------------------------
revno: 233 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Wed 2012-07-18 11:57:30 +0300
message:
Add support for options that have a finite set of acceptable values.
This includes listing the values in --list-scenes, and warning the users if
they use unacceptable values.
------------------------------------------------------------
revno: 232.1.6
committer: Alexandros Frantzis <email address hidden>
branch nick: options-finite-value-set
timestamp: Tue 2012-07-17 12:29:41 +0300
message:
Benchmark,SceneDefaultOptions: Warn when trying to set an option with an unacceptable value.
------------------------------------------------------------
revno: 232.1.5
committer: Alexandros Frantzis <email address hidden>
branch nick: options-finite-value-set
timestamp: Tue 2012-07-17 12:12:39 +0300
message:
Scene: Don't set options with values that are not acceptable.
------------------------------------------------------------
revno: 232.1.4
committer: Alexandros Frantzis <email address hidden>
branch nick: options-finite-value-set
timestamp: Tue 2012-07-17 11:47:15 +0300
message:
Main: Use !std::vector::empty() instead of checking for std::vector::size() > 0.
------------------------------------------------------------
revno: 232.1.3
committer: Alexandros Frantzis <email address hidden>
branch nick: options-finite-value-set
timestamp: Mon 2012-07-16 17:25:30 +0300
message:
Scene*: Add acceptable value information to scene options.
------------------------------------------------------------
revno: 232.1.2
committer: Alexandros Frantzis <email address hidden>
branch nick: options-finite-value-set
timestamp: Mon 2012-07-16 17:01:35 +0300
message:
Main: Display list of acceptable option values when listing scene information.
------------------------------------------------------------
revno: 232.1.1
committer: Alexandros Frantzis <email address hidden>
branch nick: options-finite-value-set
timestamp: Mon 2012-07-16 17:00:56 +0300
message:
Scene: Store list of acceptable option values in Scene::Option.
------------------------------------------------------------
revno: 232
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Wed 2012-07-11 10:54:17 +0300
message:
SceneJellyfish: Properly initialize member variables.
------------------------------------------------------------
revno: 231 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2012-07-10 12:47:01 +0300
message:
Android: Create a GUI for defining and running benchmarks.
------------------------------------------------------------
revno: 229.1.11
committer: Alexandros Frantzis <email address hidden>
branch nick: android-gui
timestamp: Tue 2012-07-10 12:44:06 +0300
message:
Android: Display the available scenes in sorted order.
------------------------------------------------------------
revno: 229.1.10
committer: Alexandros Frantzis <email address hidden>
branch nick: android-gui
timestamp: Fri 2012-07-06 16:31:01 +0300
message:
Android: Improve the design of list and list items.
------------------------------------------------------------
revno: 229.1.9
committer: Alexandros Frantzis <email address hidden>
branch nick: android-gui
timestamp: Fri 2012-07-06 16:01:37 +0300
message:
Android: Add list headers for scene name and options in editor view.
------------------------------------------------------------
revno: 229.1.8
committer: Alexandros Frantzis <email address hidden>
branch nick: android-gui
timestamp: Fri 2012-07-06 13:46:33 +0300
message:
Android: Add "Run" button to the editor activity.
This allows easy testing of benchmark settings before saving.
------------------------------------------------------------
revno: 229.1.7
committer: Alexandros Frantzis <email address hidden>
branch nick: android-gui
timestamp: Thu 2012-07-05 18:59:36 +0300
message:
Android: Ensure that the soft keyboard is shown when editing options.
------------------------------------------------------------
revno: 229.1.6
committer: Alexandros Frantzis <email address hidden>
branch nick: android-gui
timestamp: Thu 2012-07-05 18:39:19 +0300
message:
Android: Ensure our dialogs are destroyed when dismissed.
Our dialogs use invocation-specific data, so they can't be reused.
------------------------------------------------------------
revno: 229.1.5
committer: Alexandros Frantzis <email address hidden>
branch nick: android-gui
timestamp: Thu 2012-07-05 18:05:49 +0300
message:
Android: Implement a better benchmark editor that knows about the scenes and their options.
------------------------------------------------------------
revno: 229.1.4
committer: Alexandros Frantzis <email address hidden>
branch nick: android-gui
timestamp: Wed 2012-07-04 17:38:56 +0300
message:
Android: Implement native function to expose scene information to java code.
------------------------------------------------------------
revno: 229.1.3
committer: Alexandros Frantzis <email address hidden>
branch nick: android-gui
timestamp: Wed 2012-07-04 17:27:42 +0300
message:
Android: Move Glmark2Native and GLVisualConfig to dedicated files.
------------------------------------------------------------
revno: 229.1.2
committer: Alexandros Frantzis <email address hidden>
branch nick: android-gui
timestamp: Tue 2012-07-03 17:19:27 +0300
message:
Android: First take on a GUI for Android.
------------------------------------------------------------
revno: 229.1.1
committer: Alexandros Frantzis <email address hidden>
branch nick: android-gui
timestamp: Tue 2012-07-03 15:18:59 +0300
message:
Android: Update files needed for ant build system.
------------------------------------------------------------
revno: 230 [merge]
committer: Jesse Barker <email address hidden>
branch nick: trunk
timestamp: Mon 2012-07-09 08:54:30 -0700
message:
Merge of lp:~glmark2-dev/glmark2/jellyfish.
Adds new scene (SceneJellyfish) based upon Aleksandar Rodic's WebGL demo.
------------------------------------------------------------
revno: 225.1.18
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Mon 2012-07-09 08:02:54 -0700
message:
Android: Revert unintentional removal of default properties file.
------------------------------------------------------------
revno: 225.1.17
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Mon 2012-07-09 08:00:06 -0700
message:
SceneJellyfish: Relocate core scene timing initialization so we don't measure
set up as part of the scene. This obviates the need for the time parameter
in the private initialization method.
------------------------------------------------------------
revno: 225.1.16
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Thu 2012-07-05 10:22:16 -0700
message:
Ensure file access for all model data goes through Util::get_resource() or the
file will fail to open on Android. This was a problem both for the original
OBJ file format support as well as the recently added jellyfish "modified OBJ"
model.
------------------------------------------------------------
revno: 225.1.15
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Thu 2012-07-05 08:09:00 -0700
message:
SceneJellyfish: Clean up the arrangement of the files to more closely match the
naming scheme for the other scenes (rename the header "scene-jellyfish.h", and
move the private implementation into the public scene source).
------------------------------------------------------------
revno: 225.1.14
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Thu 2012-07-05 07:22:50 -0700
message:
SceneJellyfish: Update time initialization to correct initial rotation and vertex
animation parameters.
------------------------------------------------------------
revno: 225.1.13
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Tue 2012-07-03 15:30:33 -0700
message:
SceneJellyfish: Disable depth test when drawing the jellyfish. Not a problem for
OpenGL on the NVIDIA proprietary driver, but for OpenGL ES 2, seems to be (at
least for the Mesa software renderer).
------------------------------------------------------------
revno: 225.1.12
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Tue 2012-07-03 14:59:55 -0700
message:
SceneJellyfish: Small changes for Android build.
------------------------------------------------------------
revno: 225.1.11
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Tue 2012-07-03 14:59:23 -0700
message:
Re-order default benchmarks according to convention, now that debugging is done.
------------------------------------------------------------
revno: 225.1.10
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Tue 2012-07-03 11:38:24 -0700
message:
SceneJellyfish: Ensure that the wrap parameters for the caustic textures are set
to GL_REPEAT as the texcoord computation generates values well outside of the
(0.0, 1.0) interval.
------------------------------------------------------------
revno: 225.1.9
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Tue 2012-07-03 11:34:52 -0700
message:
SceneJellyfish: Simplify vertex animation computation.
------------------------------------------------------------
revno: 225.1.8
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Tue 2012-07-03 10:34:53 -0700
message:
CanvasX11: Undo the clear color change that was used to "fake" the SceneJellyfish
background.
------------------------------------------------------------
revno: 225.1.7
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Tue 2012-07-03 10:34:11 -0700
message:
SceneJellyfish: Do a proper gradient fill for the background of the scene.
------------------------------------------------------------
revno: 225.1.6
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Mon 2012-07-02 15:55:56 -0700
message:
SceneJellyfish: Further updates to time management. Looks pretty smooth now.
I've pruned some unnecessary things out of the shader setup (e.g., view matrix
was identity). Also, notice that GL_CULL_FACE was enabled, which made the
"inside" of the jellyfish get culled out. Caustics effect still not quite
right. Once that is squared away, I can properly sort out the background
gradient (for now just clear to one of the blue colors in the original gradient
for transparency debugging purposes).
------------------------------------------------------------
revno: 225.1.5
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Mon 2012-07-02 15:13:06 -0700
message:
SceneJellyfish: Put transparency value back into fragment color result.
------------------------------------------------------------
revno: 225.1.4
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Mon 2012-07-02 11:43:30 -0700
message:
SceneJellyfish: Tweak update_time() for better caustic texture selection.
------------------------------------------------------------
revno: 225.1.3
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Mon 2012-07-02 11:37:38 -0700
message:
SceneJellyfish: A couple of small tweaks to get the geometry rendering and the
sense of time somewhat smoothed out.
------------------------------------------------------------
revno: 225.1.2
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Mon 2012-07-02 10:34:48 -0700
message:
SceneJellyfish: Checkpointing. Everything should be set up at this point, but
still not seeing anything on screen.
------------------------------------------------------------
revno: 225.1.1
committer: Jesse Barker <email address hidden>
branch nick: jellyfish
timestamp: Thu 2012-06-28 13:49:08 -0700
message:
SceneJellyfish: Adding vertex and fragment shaders for the jellyfish scene.
------------------------------------------------------------
revno: 229 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Wed 2012-07-04 13:20:52 +0300
message:
SceneTerrain: Add scene based on WebGL dynamic terrain demo.
------------------------------------------------------------
revno: 226.1.5
committer: Alexandros Frantzis <email address hidden>
branch nick: scene-terrain
timestamp: Wed 2012-07-04 13:14:08 +0300
message:
SceneTerrain: Properly initialize member variables.
------------------------------------------------------------
revno: 226.1.4
committer: Alexandros Frantzis <email address hidden>
branch nick: scene-terrain
timestamp: Tue 2012-07-03 12:56:14 +0300
message:
SceneTerrain: Ensure implementation supports vertex texture fetch before running.
------------------------------------------------------------
revno: 226.1.3
committer: Alexandros Frantzis <email address hidden>
branch nick: scene-terrain
timestamp: Fri 2012-06-29 16:37:34 +0300
message:
SceneTerrain: Add "bloom" and "tilt-shift" scene options.
------------------------------------------------------------
revno: 226.1.2
committer: Alexandros Frantzis <email address hidden>
branch nick: scene-terrain
timestamp: Fri 2012-06-29 15:46:57 +0300
message:
SceneTerrain: Add "repeat-overlay" scene option.
------------------------------------------------------------
revno: 226.1.1
committer: Alexandros Frantzis <email address hidden>
branch nick: scene-terrain
timestamp: Fri 2012-06-29 15:27:16 +0300
message:
SceneTerrain: Add scene based on WebGL dynamic terrain demo.
------------------------------------------------------------
revno: 228
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Wed 2012-07-04 13:07:42 +0300
message:
SceneIdeas,SceneTexture: Properly initialize member variables.
------------------------------------------------------------
revno: 227 [merge]
committer: Jesse Barker <email address hidden>
branch nick: trunk
timestamp: Thu 2012-06-28 09:16:43 -0700
message:
Merge of lp:~glmark2-dev/glmark2/texgen
SceneTexture: Add an option to compute the texture coordinates in the shader
rather than supplying them as a vertex attribute. This also includes a new
shader to support this.
------------------------------------------------------------
revno: 224.2.1
committer: Jesse Barker <email address hidden>
branch nick: texgen
timestamp: Tue 2012-06-26 15:41:07 -0700
message:
SceneTexture: Add new option for generating texture coordinates in the shader
rather than in the application (and sending them down as a vertex attribute).
Also gets a new shader to facilitate this process.
------------------------------------------------------------
revno: 226 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2012-06-28 13:27:55 +0300
message:
Texture: Refactor image reading infrastructure and add support for JPEG files.
------------------------------------------------------------
revno: 224.1.8
committer: Alexandros Frantzis <email address hidden>
branch nick: image-readers
timestamp: Wed 2012-06-27 19:17:42 +0300
message:
ImageReader: Remove C casts.
------------------------------------------------------------
revno: 224.1.7
committer: Alexandros Frantzis <email address hidden>
branch nick: image-readers
timestamp: Wed 2012-06-27 11:13:50 +0300
message:
Android: Add libjpeg-turbo to in-tree and NDK builds.
------------------------------------------------------------
revno: 224.1.6
committer: Alexandros Frantzis <email address hidden>
branch nick: image-readers
timestamp: Wed 2012-06-27 11:13:27 +0300
message:
libjpeg-turbo: Add libjpeg-turbo source code for use in Android builds.
------------------------------------------------------------
revno: 224.1.5
committer: Jesse Barker <email address hidden>
branch nick: image-readers
timestamp: Mon 2012-06-25 09:32:49 -0700
message:
Texture: Fix comment so it applies to the texture image file processing logic
(rather than the object/model selection logic).
------------------------------------------------------------
revno: 224.1.4
committer: Alexandros Frantzis <email address hidden>
branch nick: jpeg-textures
timestamp: Mon 2012-06-25 16:17:19 +0300
message:
Texture: Refactor ImageData loading API.
Use a single ImageData::load() method that uses the provided ImageReader
to get the image data.
------------------------------------------------------------
revno: 224.1.3
committer: Alexandros Frantzis <email address hidden>
branch nick: jpeg-textures
timestamp: Mon 2012-06-25 16:16:32 +0300
message:
ImageReader: Refactor image reading infrastructure.
This commit introduces the ImageReader abstract base class and the
PNG and JPEG readers as subclasses of ImageReader.
------------------------------------------------------------
revno: 224.1.2
committer: Alexandros Frantzis <email address hidden>
branch nick: jpeg-textures
timestamp: Mon 2012-06-25 14:45:01 +0300
message:
Texture: Support loading textures from JPEG files.
------------------------------------------------------------
revno: 224.1.1
committer: Alexandros Frantzis <email address hidden>
branch nick: jpeg-textures
timestamp: Mon 2012-06-25 14:40:03 +0300
message:
Texture: Add infrastructure for reading images from JPEG files.
------------------------------------------------------------
revno: 225
committer: Jesse Barker <email address hidden>
branch nick: trunk
timestamp: Wed 2012-06-27 15:16:47 -0700
message:
SceneIdeas: Convert all element array handling from unsigned int to unsigned short.
OpenGL ES 2.0 only allows GL_UNSIGNED_BYTE or GL_UNSIGNED_SHORT for the index
type, and the use of GL_UNSIGNED_INT, while legal for OpenGL and permitted by
several OpenGL ES 2.0 implmentations generates an error on stricter ones.
