lp:~glmark2-dev/glmark2/libmatrix-util

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:glmark2/2011.11 at revision 193

Alexandros Frantzis: Pending requested 2012-01-26

Diff: 5238 lines (+2470/-1420)

40 files modified

android/jni/Android.mk (+1/-2)
android/jni/Android.ndk.mk (+1/-2)
src/android.cpp (+1/-0)
src/libmatrix/Makefile (+7/-2)
src/libmatrix/gl-if.h (+18/-0)
src/libmatrix/log.cc (+178/-0)
src/libmatrix/log.h (+46/-0)
src/libmatrix/mat.h (+138/-6)
src/libmatrix/matrix_inverse_test.cc (+0/-152)
src/libmatrix/program.cc (+5/-27)
src/libmatrix/program.h (+1/-4)
src/libmatrix/shader-source.cc (+615/-0)
src/libmatrix/shader-source.h (+103/-0)
src/libmatrix/test/basic-global-const.vert (+15/-0)
src/libmatrix/test/basic.frag (+7/-0)
src/libmatrix/test/basic.vert (+14/-0)
src/libmatrix/test/const_vec_test.cc (+60/-0)
src/libmatrix/test/const_vec_test.h (+39/-0)
src/libmatrix/test/inverse_test.cc (+172/-0)
src/libmatrix/test/inverse_test.h (+39/-0)
src/libmatrix/test/libmatrix_test.cc (+68/-0)
src/libmatrix/test/libmatrix_test.h (+51/-0)
src/libmatrix/test/options.cc (+76/-0)
src/libmatrix/test/shader_source_test.cc (+49/-0)
src/libmatrix/test/shader_source_test.h (+32/-0)
src/libmatrix/test/transpose_test.cc (+297/-0)
src/libmatrix/test/transpose_test.h (+38/-0)
src/libmatrix/util.cc (+165/-0)
src/libmatrix/util.h (+71/-0)
src/libmatrix/vec.h (+144/-6)
src/log.cpp (+0/-182)
src/log.h (+0/-43)
src/main.cpp (+9/-3)
src/options.cpp (+1/-2)
src/scene-effect-2d.cpp (+7/-4)
src/shader-source.cpp (+0/-625)
src/shader-source.h (+0/-113)
src/util.cpp (+0/-164)
src/util.h (+0/-81)
src/wscript_build (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

201. By Jesse Barker on 2012-01-27

Update to reflect the addition of the appname string to the Log object in libmatrix.
Also, the Util object gets a member to generate the appname given the full path
of the program binary (argv[0]).

200. By Jesse Barker on 2012-01-27

Merge one more missing revision from lp:libmatrix found during glcompbench integration.
Remove obsolete matrix_inverse_test (all tests are now in test subdirectory).

199. By Jesse Barker on 2012-01-27

Update local libmatrix to lp:libmatrix revno 34 to include some log fixes for Android

198. By Alexandros Frantzis on 2012-01-27

Main,Android,Options: Initialize the Log class explicitly after parsing the options.

This removes the coupling between the Log and Options classes, and keeps
Options::parse_args() free of side effects.

Merged branch lp:~linaro-graphics-wg/glmark2/libmatrix-util-alf

197. By Alexandros Frantzis on 2012-01-27

Android: Use all libmatrix source files when building it.

196. By Jesse Barker on 2012-01-26

Update copyright on files affected by libmatrix update.

195. By Jesse Barker on 2012-01-26

Now that we get the common utility object (Log, Util, ShaderSource) from
libmatrix, remove them from glmark2 proper, and update to reflect the integration
of the libmatrix objects.

194. By Jesse Barker on 2012-01-26

Update to reflect lp:libmatrix revno 32. A fix found during integration with
glmark2 whereby non-prefixed log messages were emitting a colon.

193. By Jesse Barker on 2012-01-26

Update internal copy of libmatrix to reflect current trunk there
(current as of lp:libmatrix revno 31). Also fix the build to ensure
USE_EXCEPTIONS is defined appropriately.

192. By Alexandros Frantzis on 2012-01-19

Build,Doc: Update files for 2012.01 release.