lp://qastaging/~jesse-barker/glmark2/extra-support

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/glmark2/2011.11 at revision 150

Alexandros Frantzis: Approve on 2011-10-10

Diff: 429 lines (+227/-27)

8 files modified

src/model.cpp (+117/-1)
src/model.h (+40/-5)
src/scene-build.cpp (+46/-15)
src/scene-bump.cpp (+5/-4)
src/scene-shading.cpp (+2/-1)
src/scene-texture.cpp (+2/-1)
src/scene.h (+3/-0)
wscript (+12/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

156. By Jesse Barker on 2011-10-07

Add some helpful comments to the model object now that things have changed a bit.

155. By Jesse Barker on 2011-10-07

Make format-specific load functions private as they are no longer used by any
of the scenes.

154. By Jesse Barker on 2011-10-07

Convert the remaining tests to use the load model by name functionality.

153. By Jesse Barker on 2011-10-07

Hook up the new model mechanism to the build scene. Other scenes to follow.

152. By Jesse Barker on 2011-10-07

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.

151. By Jesse Barker on 2011-10-07

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.

150. By Jesse Barker on 2011-10-07

Revert previous build changes as we don't need most of them.

149. By Jesse Barker on 2011-10-06

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.

148. By Alexandros Frantzis on 2011-09-29

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).

147. By Alexandros Frantzis on 2011-09-28

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.