revno: 219
tags: 2012.05
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2012-05-24 13:11:54 +0300
message:
Build,Doc: Update files for 2012.05 release.
------------------------------------------------------------
revno: 218
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2012-05-24 12:54:11 +0300
message:
Android: Fix crash when 'args' extra parameter is undefined.
------------------------------------------------------------
revno: 217
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Thu 2012-05-24 12:25:58 +0300
message:
Android: Don't treat unused parameter warnings as errors when building with the NDK.
The stlport C++ library exports code with unused parameters, causing builds
to fail if we treat unused parameter warnings as errors.
------------------------------------------------------------
revno: 216
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2012-05-22 15:28:40 +0300
message:
SceneIdeas: Return ValidationUnknown as a validation result.
------------------------------------------------------------
revno: 215
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2012-05-22 15:26:43 +0300
message:
SceneTexture: Update reference pixel values used for validation.
------------------------------------------------------------
revno: 214 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2012-05-22 15:21:27 +0300
message:
SceneTexture: Add support for additional models and textures.
This patchset adds support for models apart from the cube, and textures apart
from the crate base. Also includes 3 new square textures cropped from hi-res
NASA images for use in the texture mapping scene.
It also adds a new Model::calculate_texcoords() method which uses positional
spherical mapping to generate texcoords for the model.
------------------------------------------------------------
revno: 208.2.9
committer: Jesse Barker <email address hidden>
branch nick: texture-models
timestamp: Tue 2012-05-22 09:46:33 +0100
message:
Scene{Build,Shading,Texture}: Make the armadillo model start out facing front.
------------------------------------------------------------
revno: 208.2.8
committer: Jesse Barker <email address hidden>
branch nick: texture-models
timestamp: Fri 2012-05-18 14:33:54 +0100
message:
SceneTexture: Tweak the translation to push the model away from the viewer a
bit (some models were rotating slightly out of the window).
------------------------------------------------------------
revno: 208.2.7
committer: Jesse Barker <email address hidden>
branch nick: texture-models
timestamp: Fri 2012-05-18 14:23:26 +0100
message:
Model: Update calculate_texcoords() to use positional spherical mapping. Yields
good results on the additional models.
------------------------------------------------------------
revno: 208.2.6
committer: Jesse Barker <email address hidden>
branch nick: texture-models
timestamp: Fri 2012-05-18 14:20:54 +0100
message:
SceneTexture: Since Model::calculate_normals() references the texcoord, make
sure to call Model::calculate_texcoords() first.
------------------------------------------------------------
revno: 208.2.5
committer: Jesse Barker <email address hidden>
branch nick: texture-models
timestamp: Tue 2012-05-15 19:38:47 +0100
message:
Texture: Add a TextureMap infrastructure similar to what's there for models. It
enables (and ultimately requires) a map of all of the texture images available
in the data area. For textured scenes, this allows for the specification of the
texture image for a scene to be a user-specified option (assuming the texture
is found). Also update all of the scenes that were already using Texture::load
to use the new Texture::find_textures as load is now by texture name rather than
pathname. Update the Texture method docs so it's clear to anyone else how this
is used.
------------------------------------------------------------
revno: 208.2.4
committer: Jesse Barker <email address hidden>
branch nick: texture-models
timestamp: Tue 2012-05-15 19:35:35 +0100
message:
Add 3 new 512x512 texture images. These were cropped from larger NASA
"picture of the day" images. Just to have some interesting options.
------------------------------------------------------------
revno: 208.2.3
committer: Jesse Barker <email address hidden>
branch nick: texture-models
timestamp: Tue 2012-05-15 19:34:21 +0100
message:
Model: In computing texcoords, apply a planar mapping with scaling vector based
upon the bounding box. Definitely not perfect, but creates an interesting enough
effect.
------------------------------------------------------------
revno: 208.2.2
committer: Jesse Barker <email address hidden>
branch nick: texture-models
timestamp: Tue 2012-05-15 13:46:43 +0100
message:
SceneTexture: Add support for loading any of the models (hypothetically),
similar to the support in SceneBuild and SceneShading. Uses the new Model
object members to manage texcoords.
------------------------------------------------------------
revno: 208.2.1
committer: Jesse Barker <email address hidden>
branch nick: texture-models
timestamp: Tue 2012-05-15 13:44:24 +0100
message:
Model: Add a couple of new members to allow us to make up texcoords for models
whose source files didn't contain any.
------------------------------------------------------------
revno: 213
committer: Jesse Barker <email address hidden>
branch nick: trunk
timestamp: Tue 2012-05-22 10:43:45 +0100
message:
libmatrix: Missed one (minor) change from the 2012.05 release.
------------------------------------------------------------
revno: 212
committer: Jesse Barker <email address hidden>
branch nick: trunk
timestamp: Tue 2012-05-22 10:33:07 +0100
message:
libmatrix: Update to 2012.05 release.
------------------------------------------------------------
revno: 211
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Mon 2012-05-21 16:56:42 +0300
message:
Android: Update the in-tree Android makefile to support SceneIdeas.
------------------------------------------------------------
revno: 210
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2012-05-15 16:10:28 +0300
message:
Doc: Update Android README file with command-line limitations and peculiarities.
------------------------------------------------------------
revno: 209 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2012-05-15 16:09:27 +0300
message:
Android: Allow user configuration of visual used for rendering.
------------------------------------------------------------
revno: 208.1.6
committer: Alexandros Frantzis <email address hidden>
branch nick: configurable-visual-android
timestamp: Tue 2012-05-15 15:39:38 +0300
message:
Android: Request a 16-bit depth buffer by default.
------------------------------------------------------------
revno: 208.1.5
committer: Alexandros Frantzis <email address hidden>
branch nick: configurable-visual-android
timestamp: Tue 2012-05-15 15:33:41 +0300
message:
Android: Display a debug message with the chosen visual configuration.
------------------------------------------------------------
revno: 208.1.4
committer: Alexandros Frantzis <email address hidden>
branch nick: configurable-visual-android
timestamp: Tue 2012-05-15 15:32:50 +0300
message:
Android: Set the target GL visual config from the --visual-config command-line option.
------------------------------------------------------------
revno: 208.1.3
committer: Alexandros Frantzis <email address hidden>
branch nick: configurable-visual-android
timestamp: Tue 2012-05-15 15:31:10 +0300
message:
Android: Use the scoreConfig() native function to select the GL visual config.
------------------------------------------------------------
revno: 208.1.2
committer: Alexandros Frantzis <email address hidden>
branch nick: configurable-visual-android
timestamp: Tue 2012-05-15 15:28:51 +0300
message:
Android: Add scoreConfig() native function.
This functions gives access to the glmark2 GL visual configuration scoring
infrastructure, in order to get a consistent selection policy on both X11
and Android.
------------------------------------------------------------
revno: 208.1.1
committer: Alexandros Frantzis <email address hidden>
branch nick: configurable-visual-android
timestamp: Tue 2012-05-15 12:02:00 +0300
message:
Android: Use a separate class for the JNI bindings.
------------------------------------------------------------
revno: 208 [merge]
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2012-05-15 11:40:46 +0300
message:
CanvasX11*: Allow user configuration of visual used for rendering.
------------------------------------------------------------
revno: 205.1.8
committer: Alexandros Frantzis <email address hidden>
branch nick: configurable-visual
timestamp: Fri 2012-05-11 16:53:08 +0300
message:
CanvasX11*: Improve config selection.
Select the best matching config using the GLVisualConfig scoring
method, instead of just the first one returned by the implementation.
------------------------------------------------------------
revno: 205.1.7
committer: Alexandros Frantzis <email address hidden>
branch nick: configurable-visual
timestamp: Fri 2012-05-11 16:49:53 +0300
message:
GLVisualConfig: Add method to score how well a config matches another target config.
------------------------------------------------------------
revno: 205.1.6
committer: Alexandros Frantzis <email address hidden>
branch nick: configurable-visual
timestamp: Fri 2012-05-11 14:02:37 +0300
message:
CanvasX11*: Remove GLVisualInfo in favor of GLVisualConfig.
------------------------------------------------------------
revno: 205.1.5
committer: Alexandros Frantzis <email address hidden>
branch nick: configurable-visual
timestamp: Thu 2012-05-10 12:19:38 +0300
message:
Doc: Add documentation for the 'visual-config' command-line option.
------------------------------------------------------------
revno: 205.1.4
committer: Alexandros Frantzis <email address hidden>
branch nick: configurable-visual
timestamp: Thu 2012-05-10 12:18:53 +0300
message:
Main,Options: Add and use the 'visual-config' command-line option.
------------------------------------------------------------
revno: 205.1.3
committer: Alexandros Frantzis <email address hidden>
branch nick: configurable-visual
timestamp: Thu 2012-05-10 12:04:09 +0300
message:
CanvasX11*: Use the preferred visual configuration parameters to select EGL/GLX config.
------------------------------------------------------------
revno: 205.1.2
committer: Alexandros Frantzis <email address hidden>
branch nick: configurable-visual
timestamp: Thu 2012-05-10 12:03:12 +0300
message:
Canvas: Add method to set the preferred visual configuration.
------------------------------------------------------------
revno: 205.1.1
committer: Alexandros Frantzis <email address hidden>
branch nick: configurable-visual
timestamp: Thu 2012-05-10 12:02:33 +0300
message:
GLVisualConfig: Introduce class to hold GL visual configuration parameters.
------------------------------------------------------------
revno: 207
committer: Jesse Barker <email address hidden>
branch nick: trunk
timestamp: Fri 2012-05-11 11:58:09 -0700
message:
SceneIdeas: Updates to the fly around speed options. Create a special option
value ("speed=duration") that computes the time factor as a function of the
"duration" option. Make other speeds raw number values (help text explains
that 1.0 is "real" or "wall clock" time, <1.0 is slower and >1.0 is faster).
Update default benchmark list to reflect the use of the duration option.
------------------------------------------------------------
revno: 206 [merge]
committer: Jesse Barker <email address hidden>
branch nick: trunk
timestamp: Thu 2012-05-10 07:30:47 -0700
message:
Merging lp:~glmark2-dev/glmark2/ideas
Adds new SceneIdeas.
------------------------------------------------------------
revno: 204.1.25
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Wed 2012-05-09 13:38:24 -0700
message:
SceneIdeas: Update the comment for clarity.
------------------------------------------------------------
revno: 204.1.24
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Wed 2012-05-09 13:28:08 -0700
message:
SceneIdeas: Use Alexandros' suggestion to reverse time at the end of each 'cycle'
through the fly around.
------------------------------------------------------------
revno: 204.1.23
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Wed 2012-05-09 09:06:33 -0700
message:
Move SceneIdeas to after SceneBuffer in the default initialization of the
benchmark list.
------------------------------------------------------------
revno: 204.1.22
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Wed 2012-05-09 06:39:12 -0700
message:
SceneIdeas: Add to default benchmark list.
------------------------------------------------------------
revno: 204.1.21
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Wed 2012-05-09 06:31:37 -0700
message:
SceneIdeas: Remove extraneous comment.
------------------------------------------------------------
revno: 204.1.20
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Tue 2012-05-08 13:58:14 -0700
message:
Android: Revert change to use gnustl rather than stlport as gnu-specific STL
usage was changed in the source.
------------------------------------------------------------
revno: 204.1.19
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Tue 2012-05-08 13:53:58 -0700
message:
SceneIdeas: Using less gnu-specific accessor method for std::vector data access.
------------------------------------------------------------
revno: 204.1.18
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Tue 2012-05-08 06:53:58 -0700
message:
SceneIdeas: Update benchmark registration for Android to include the new scene.
------------------------------------------------------------
revno: 204.1.17
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Mon 2012-05-07 15:31:59 -0700
message:
SceneIdeas: Update Android build to support the new scene.
------------------------------------------------------------
revno: 204.1.16
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Mon 2012-05-07 13:05:10 -0700
message:
SceneIdeas: Handle the run-forever command line option cleanly, including setup
and teardown, and resetting the frame count so the fps numbers make sense across
iterations. Also, take the opportunity to implement a speed control, which gives
us a nice demo with no overhead (apart from getting the options around duration,
speed, and repeating correct).
------------------------------------------------------------
revno: 204.1.15
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Mon 2012-05-07 10:38:07 -0700
message:
SceneIdeas: Make sure that we clamp the time when we hit the temporal end of the scene.
------------------------------------------------------------
revno: 204.1.14
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Thu 2012-05-03 11:10:31 -0700
message:
SceneIdeas: Rename shader source files so they are clearly identified as being
associated with this scene.
------------------------------------------------------------
revno: 204.1.13
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Mon 2012-04-30 11:37:22 -0700
message:
SceneIdeas: Add copyright notices to all source files, and add the general notice
to the "COPYING" data. Also, remove one extraneous file that snuck into a
previous add undetected.
------------------------------------------------------------
revno: 204.1.12
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Mon 2012-04-30 09:52:51 -0700
message:
SceneIdeas: Make program management a little cleaner by adding a private member
to select the correct one for the current drawing style.
------------------------------------------------------------
revno: 204.1.11
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Mon 2012-04-30 09:34:51 -0700
message:
SceneIdeas: Update the Logo object to construct the normal matrix in the object
source rather than the vertex shader as the built-ins inverse() and transpose()
needed to do it in the shader are not present in GLSL ES.
------------------------------------------------------------
revno: 204.1.10
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Mon 2012-04-30 09:33:42 -0700
message:
SceneIdeas: the fragment shader for the shadow of the Logo object needs to use
the texture2D() built-in for use with both GLSL and GLSL ES.
------------------------------------------------------------
revno: 204.1.9
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Mon 2012-04-30 09:32:11 -0700
message:
SceneIdeas: Update the Lamp object so that its normal matrix is constructed in
the object source, rather than in the vertex shader as GLSL ES does not support
the built-in inverse() and transform() objects needed to do it in the shader.
------------------------------------------------------------
revno: 204.1.8
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Mon 2012-04-30 09:31:04 -0700
message:
Program: Update the symbol handling in the Program object to deal with uniforms
of type LibMatrix::mat3.
------------------------------------------------------------
revno: 204.1.7
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Mon 2012-04-30 07:39:37 -0700
message:
SceneIdeas: Scrub out the rest of the vertex array object logic and tweak the
vertex buffer object management to allow the text to appear properly.
------------------------------------------------------------
revno: 204.1.6
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Fri 2012-04-27 15:12:22 -0700
message:
First pass at making shaders compatible with GLSL|ES. Still much to do, and will
likely stick with GLSL until the scene renders like the original demo, then
switch to ES.
------------------------------------------------------------
revno: 204.1.5
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Fri 2012-04-27 15:11:49 -0700
message:
Actually mark SceneIdeas as runnable so it draws something...
------------------------------------------------------------
revno: 204.1.4
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Fri 2012-04-27 15:10:31 -0700
message:
Replacing old GL_POLYGON primitives with GL_TRIANGLE_STRIP for the paper, and
GL_TRIANGLE_FAN for the face of the light.
------------------------------------------------------------
revno: 204.1.3
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Fri 2012-04-27 11:00:45 -0700
message:
SceneIdeas: Everything needed to allow it to build including the definition of
the derived scene object itself, some tweaks to the build to account for the
segregation of the guts into a separate subdirectory, and the registration of
the new scene. Shaders need tweaking to work with ES2.
------------------------------------------------------------
revno: 204.1.2
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Fri 2012-04-27 10:58:37 -0700
message:
SceneIdeas: Add the guts of the new "Ideas on OpenGL" scene. It comprises new
objects for the scene including a Table, Logo and Lamp, along with a set of
objects for drawing text onto a piece of paper that is drawn onto the table top.
------------------------------------------------------------
revno: 204.1.1
committer: Jesse Barker <email address hidden>
branch nick: ideas
timestamp: Fri 2012-04-27 07:35:00 -0700
message:
Ideas: Add shaders for "Ideas in OpenGL" scene.
------------------------------------------------------------
revno: 205
committer: Alexandros Frantzis <email address hidden>
branch nick: opaque-framebuffer
timestamp: Mon 2012-05-07 15:45:34 +0300
message:
Ensure that the framebuffer is drawn opaquely.
Some rendering operations draw translucent pixels to the framebuffer,
leading to inconsistent visual results on different platforms and
compositing managers. This commit ensures that pixels drawn to the
framebuffer by the various scenes are opaque.
------------------------------------------------------------
revno: 204
committer: Alexandros Frantzis <email address hidden>
branch nick: trunk
timestamp: Tue 2012-04-03 11:38:00 +0300
message:
Android: Don't treat unused parameters as an error.
The AOSP ships some header files which contain functions with unused parameters.
Because we have strict compilation flags, the unused parameters break the build.
To work around this issue, this commit stops treating unused parameters as an
error, at least until the AOSP code is fixed upstream.