lp://staging/~glmark2-dev/glmark2/glmark2-package
- Get this branch:
- bzr branch lp://staging/~glmark2-dev/glmark2/glmark2-package
Branch merges
- glmark2 developers: Pending requested
-
Diff: 236804 lines (+234409/-0) (has conflicts)436 files modifiedCOPYING (+674/-0)
COPYING.SGI (+40/-0)
INSTALL (+13/-0)
INSTALL.android (+35/-0)
NEWS (+218/-0)
README (+24/-0)
README.android (+50/-0)
android/Android.mk (+14/-0)
android/AndroidManifest.xml (+54/-0)
android/CleanSpec.mk (+6/-0)
android/build.xml (+92/-0)
android/jni/Android.mk (+76/-0)
android/jni/Android.ndk.mk (+65/-0)
android/jni/Application.mk (+3/-0)
android/project.properties (+14/-0)
android/res/layout/activity_about.xml (+43/-0)
android/res/layout/activity_editor.xml (+34/-0)
android/res/layout/activity_main.xml (+20/-0)
android/res/layout/activity_results.xml (+15/-0)
android/res/layout/list_header.xml (+5/-0)
android/res/layout/list_item.xml (+32/-0)
android/res/layout/save_dialog.xml (+28/-0)
android/res/menu/main_options_menu.xml (+26/-0)
android/res/values/strings.xml (+46/-0)
android/res/xml/preferences.xml (+15/-0)
android/src/org/linaro/glmark2/AboutActivity.java (+52/-0)
android/src/org/linaro/glmark2/BenchmarkListManager.java (+189/-0)
android/src/org/linaro/glmark2/EditorActivity.java (+548/-0)
android/src/org/linaro/glmark2/GLVisualConfig.java (+46/-0)
android/src/org/linaro/glmark2/Glmark2Activity.java (+88/-0)
android/src/org/linaro/glmark2/Glmark2Native.java (+34/-0)
android/src/org/linaro/glmark2/Glmark2SurfaceView.java (+218/-0)
android/src/org/linaro/glmark2/MainActivity.java (+482/-0)
android/src/org/linaro/glmark2/MainPreferencesActivity.java (+33/-0)
android/src/org/linaro/glmark2/ResultsActivity.java (+58/-0)
android/src/org/linaro/glmark2/SceneInfo.java (+96/-0)
data/models/bunny.obj (+104501/-0)
data/models/jellyfish.jobj (+24432/-0)
data/shaders/README.shaders (+5/-0)
data/shaders/buffer-wireframe.frag (+17/-0)
data/shaders/buffer-wireframe.vert (+57/-0)
data/shaders/bump-height.frag (+56/-0)
data/shaders/bump-height.vert (+28/-0)
data/shaders/bump-normals-tangent.frag (+49/-0)
data/shaders/bump-normals-tangent.vert (+39/-0)
data/shaders/bump-normals.frag (+44/-0)
data/shaders/bump-normals.vert (+14/-0)
data/shaders/bump-poly.frag (+33/-0)
data/shaders/bump-poly.vert (+16/-0)
data/shaders/conditionals-step-conditional.all (+4/-0)
data/shaders/conditionals-step-simple.all (+1/-0)
data/shaders/conditionals.frag (+11/-0)
data/shaders/conditionals.vert (+25/-0)
data/shaders/depth.frag (+6/-0)
data/shaders/depth.vert (+12/-0)
data/shaders/desktop-blur.frag (+13/-0)
data/shaders/desktop.frag (+10/-0)
data/shaders/desktop.vert (+11/-0)
data/shaders/effect-2d-convolution.frag (+12/-0)
data/shaders/effect-2d.vert (+10/-0)
data/shaders/function-call.all (+1/-0)
data/shaders/function-step-low.all (+1/-0)
data/shaders/function-step-medium.all (+2/-0)
data/shaders/function.frag (+16/-0)
data/shaders/function.vert (+30/-0)
data/shaders/gradient.frag (+10/-0)
data/shaders/gradient.vert (+10/-0)
data/shaders/ideas-lamp-lit.frag (+68/-0)
data/shaders/ideas-lamp-lit.vert (+28/-0)
data/shaders/ideas-lamp-unlit.frag (+6/-0)
data/shaders/ideas-lamp-unlit.vert (+11/-0)
data/shaders/ideas-logo-flat.frag (+6/-0)
data/shaders/ideas-logo-flat.vert (+9/-0)
data/shaders/ideas-logo-shadow.frag (+10/-0)
data/shaders/ideas-logo-shadow.vert (+9/-0)
data/shaders/ideas-logo.frag (+35/-0)
data/shaders/ideas-logo.vert (+28/-0)
data/shaders/ideas-paper.frag (+6/-0)
data/shaders/ideas-paper.vert (+22/-0)
data/shaders/ideas-table.frag (+6/-0)
data/shaders/ideas-table.vert (+22/-0)
data/shaders/ideas-text.frag (+6/-0)
data/shaders/ideas-text.vert (+18/-0)
data/shaders/ideas-under-table.frag (+6/-0)
data/shaders/ideas-under-table.vert (+11/-0)
data/shaders/jellyfish.frag (+21/-0)
data/shaders/jellyfish.vert (+56/-0)
data/shaders/light-advanced.frag (+33/-0)
data/shaders/light-advanced.vert (+16/-0)
data/shaders/light-basic-tex-bilinear.frag (+31/-0)
data/shaders/light-basic-tex.frag (+11/-0)
data/shaders/light-basic-texgen.vert (+30/-0)
data/shaders/light-basic.frag (+7/-0)
data/shaders/light-basic.vert (+29/-0)
data/shaders/light-cel.frag (+60/-0)
data/shaders/light-phong.frag (+29/-0)
data/shaders/light-phong.vert (+23/-0)
data/shaders/light-refract.frag (+45/-0)
data/shaders/light-refract.vert (+28/-0)
data/shaders/loop-step-loop.all (+2/-0)
data/shaders/loop-step-simple.all (+1/-0)
data/shaders/loop.frag (+12/-0)
data/shaders/loop.vert (+26/-0)
data/shaders/pulsar-light.vert (+31/-0)
data/shaders/pulsar.vert (+19/-0)
data/shaders/shadow.frag (+17/-0)
data/shaders/shadow.vert (+16/-0)
data/shaders/terrain-blur.frag (+14/-0)
data/shaders/terrain-luminance.frag (+15/-0)
data/shaders/terrain-noise.frag (+124/-0)
data/shaders/terrain-normalmap.frag (+15/-0)
data/shaders/terrain-overlay.frag (+10/-0)
data/shaders/terrain-texture.vert (+18/-0)
data/shaders/terrain.frag (+112/-0)
data/shaders/terrain.vert (+48/-0)
data/shaders/text-renderer.frag (+10/-0)
data/shaders/text-renderer.vert (+10/-0)
data/wscript_build (+8/-0)
debian/changelog (+171/-0)
debian/compat (+1/-0)
debian/control (+125/-0)
debian/copyright (+103/-0)
debian/create_package_install_files.sh (+20/-0)
debian/create_package_manpages_files.sh (+20/-0)
debian/glmark2-data.install (+1/-0)
debian/rules (+37/-0)
debian/source/format (+1/-0)
debian/watch (+2/-0)
doc/glmark2.1.in (+115/-0)
doc/wscript_build (+12/-0)
src/android.cpp (+495/-0)
src/benchmark-collection.cpp (+119/-0)
src/benchmark-collection.h (+59/-0)
src/benchmark.cpp (+161/-0)
src/benchmark.h (+126/-0)
src/canvas-android.cpp (+191/-0)
src/canvas-android.h (+57/-0)
src/canvas-generic.cpp (+448/-0)
src/canvas-generic.h (+75/-0)
src/canvas.h (+261/-0)
src/default-benchmarks.h (+80/-0)
src/gl-headers.cpp (+46/-0)
src/gl-headers.h (+71/-0)
src/gl-state-egl.cpp (+619/-0)
src/gl-state-egl.h (+153/-0)
src/gl-state-glx.cpp (+348/-0)
src/gl-state-glx.h (+67/-0)
src/gl-state.h (+42/-0)
src/gl-visual-config.cpp (+123/-0)
src/gl-visual-config.h (+65/-0)
src/image-reader.cpp (+386/-0)
src/image-reader.h (+77/-0)
src/libjpeg-turbo/README (+290/-0)
src/libjpeg-turbo/README-turbo.txt (+361/-0)
src/libjpeg-turbo/config.h (+137/-0)
src/libjpeg-turbo/jaricom.c (+153/-0)
src/libjpeg-turbo/jcapimin.c (+292/-0)
src/libjpeg-turbo/jcapistd.c (+161/-0)
src/libjpeg-turbo/jcarith.c (+925/-0)
src/libjpeg-turbo/jccoefct.c (+449/-0)
src/libjpeg-turbo/jccolext.c.inc (+114/-0)
src/libjpeg-turbo/jccolor.c (+599/-0)
src/libjpeg-turbo/jcdctmgr.c (+642/-0)
src/libjpeg-turbo/jchuff.c (+1026/-0)
src/libjpeg-turbo/jchuff.h (+47/-0)
src/libjpeg-turbo/jcinit.c (+76/-0)
src/libjpeg-turbo/jcmainct.c (+293/-0)
src/libjpeg-turbo/jcmarker.c (+666/-0)
src/libjpeg-turbo/jcmaster.c (+624/-0)
src/libjpeg-turbo/jcomapi.c (+106/-0)
src/libjpeg-turbo/jconfig.h (+58/-0)
src/libjpeg-turbo/jcparam.c (+649/-0)
src/libjpeg-turbo/jcphuff.c (+831/-0)
src/libjpeg-turbo/jcprepct.c (+354/-0)
src/libjpeg-turbo/jcsample.c (+527/-0)
src/libjpeg-turbo/jctrans.c (+399/-0)
src/libjpeg-turbo/jdapimin.c (+395/-0)
src/libjpeg-turbo/jdapistd.c (+277/-0)
src/libjpeg-turbo/jdarith.c (+761/-0)
src/libjpeg-turbo/jdatadst-tj.c (+188/-0)
src/libjpeg-turbo/jdatasrc-tj.c (+182/-0)
src/libjpeg-turbo/jdcoefct.c (+749/-0)
src/libjpeg-turbo/jdcolext.c.inc (+104/-0)
src/libjpeg-turbo/jdcolor.c (+529/-0)
src/libjpeg-turbo/jdct.h (+184/-0)
src/libjpeg-turbo/jddctmgr.c (+288/-0)
src/libjpeg-turbo/jdhuff.c (+808/-0)
src/libjpeg-turbo/jdhuff.h (+234/-0)
src/libjpeg-turbo/jdinput.c (+471/-0)
src/libjpeg-turbo/jdmainct.c (+514/-0)
src/libjpeg-turbo/jdmarker.c (+1364/-0)
src/libjpeg-turbo/jdmaster.c (+601/-0)
src/libjpeg-turbo/jdmerge.c (+455/-0)
src/libjpeg-turbo/jdmrgext.c.inc (+156/-0)
src/libjpeg-turbo/jdphuff.c (+668/-0)
src/libjpeg-turbo/jdpostct.c (+290/-0)
src/libjpeg-turbo/jdsample.c (+496/-0)
src/libjpeg-turbo/jdtrans.c (+152/-0)
src/libjpeg-turbo/jerror.c (+252/-0)
src/libjpeg-turbo/jerror.h (+314/-0)
src/libjpeg-turbo/jfdctflt.c (+168/-0)
src/libjpeg-turbo/jfdctfst.c (+224/-0)
src/libjpeg-turbo/jfdctint.c (+283/-0)
src/libjpeg-turbo/jidctflt.c (+242/-0)
src/libjpeg-turbo/jidctfst.c (+368/-0)
src/libjpeg-turbo/jidctint.c (+389/-0)
src/libjpeg-turbo/jidctred.c (+398/-0)
src/libjpeg-turbo/jinclude.h (+91/-0)
src/libjpeg-turbo/jmemmgr.c (+1151/-0)
src/libjpeg-turbo/jmemnobs.c (+109/-0)
src/libjpeg-turbo/jmemsys.h (+198/-0)
src/libjpeg-turbo/jmorecfg.h (+404/-0)
src/libjpeg-turbo/jpegcomp.h (+26/-0)
src/libjpeg-turbo/jpegint.h (+401/-0)
src/libjpeg-turbo/jpeglib.h (+1213/-0)
src/libjpeg-turbo/jquant1.c (+860/-0)
src/libjpeg-turbo/jquant2.c (+1293/-0)
src/libjpeg-turbo/jsimd.h (+98/-0)
src/libjpeg-turbo/jsimddct.h (+102/-0)
src/libjpeg-turbo/jutils.c (+179/-0)
src/libjpeg-turbo/jversion.h (+31/-0)
src/libjpeg-turbo/simd/jsimd.h (+666/-0)
src/libjpeg-turbo/simd/jsimd_arm.c (+670/-0)
src/libjpeg-turbo/simd/jsimd_arm_neon.S (+2159/-0)
src/libmatrix/COPYING (+21/-0)
src/libmatrix/Makefile (+42/-0)
src/libmatrix/README (+11/-0)
src/libmatrix/gl-if.h (+18/-0)
src/libmatrix/log.cc (+173/-0)
src/libmatrix/log.h (+51/-0)
src/libmatrix/mat.cc (+173/-0)
src/libmatrix/mat.h (+1221/-0)
src/libmatrix/program.cc (+360/-0)
src/libmatrix/program.h (+165/-0)
src/libmatrix/shader-source.cc (+615/-0)
src/libmatrix/shader-source.h (+103/-0)
src/libmatrix/stack.h (+106/-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 (+72/-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/test/util_split_test.cc (+180/-0)
src/libmatrix/test/util_split_test.h (+31/-0)
src/libmatrix/util.cc (+343/-0)
src/libmatrix/util.h (+142/-0)
src/libmatrix/vec.h (+716/-0)
src/libpng/ANNOUNCE (+65/-0)
src/libpng/CMakeLists.txt (+284/-0)
src/libpng/INSTALL (+143/-0)
src/libpng/KNOWNBUG (+22/-0)
src/libpng/LICENSE (+111/-0)
src/libpng/README (+275/-0)
src/libpng/TODO (+25/-0)
src/libpng/Y2KINFO (+55/-0)
src/libpng/png.c (+1100/-0)
src/libpng/png.h (+3796/-0)
src/libpng/pngconf.h (+1665/-0)
src/libpng/pngerror.c (+396/-0)
src/libpng/pnggccrd.c (+103/-0)
src/libpng/pngget.c (+944/-0)
src/libpng/pngmem.c (+641/-0)
src/libpng/pngpread.c (+1774/-0)
src/libpng/pngread.c (+1528/-0)
src/libpng/pngrio.c (+180/-0)
src/libpng/pngrtran.c (+4467/-0)
src/libpng/pngrutil.c (+3390/-0)
src/libpng/pngset.c (+1226/-0)
src/libpng/pngtrans.c (+699/-0)
src/libpng/pngvcrd.c (+1/-0)
src/libpng/pngwio.c (+260/-0)
src/libpng/pngwrite.c (+1593/-0)
src/libpng/pngwtran.c (+582/-0)
src/libpng/pngwutil.c (+2832/-0)
src/main-loop.cpp (+333/-0)
src/main-loop.h (+141/-0)
src/main.cpp (+213/-0)
src/mesh.cpp (+639/-0)
src/mesh.h (+117/-0)
src/model.cpp (+901/-0)
src/model.h (+144/-0)
src/native-state-drm.cpp (+348/-0)
src/native-state-drm.h (+92/-0)
src/native-state-mir.cpp (+269/-0)
src/native-state-mir.h (+52/-0)
src/native-state-wayland.cpp (+300/-0)
src/native-state-wayland.h (+117/-0)
src/native-state-x11.cpp (+210/-0)
src/native-state-x11.h (+51/-0)
src/native-state.h (+68/-0)
src/options.cpp (+199/-0)
src/options.h (+59/-0)
src/scene-buffer.cpp (+472/-0)
src/scene-build.cpp (+269/-0)
src/scene-bump.cpp (+417/-0)
src/scene-clear.cpp (+81/-0)
src/scene-collection.h (+81/-0)
src/scene-conditionals.cpp (+156/-0)
src/scene-default-options.cpp (+62/-0)
src/scene-desktop.cpp (+1039/-0)
src/scene-effect-2d.cpp (+444/-0)
src/scene-function.cpp (+182/-0)
src/scene-grid.cpp (+126/-0)
src/scene-ideas.cpp (+414/-0)
src/scene-ideas/a.cc (+179/-0)
src/scene-ideas/characters.h (+157/-0)
src/scene-ideas/d.cc (+142/-0)
src/scene-ideas/e.cc (+139/-0)
src/scene-ideas/i.cc (+116/-0)
src/scene-ideas/lamp.cc (+258/-0)
src/scene-ideas/lamp.h (+64/-0)
src/scene-ideas/logo.cc (+788/-0)
src/scene-ideas/logo.h (+126/-0)
src/scene-ideas/m.cc (+210/-0)
src/scene-ideas/n.cc (+146/-0)
src/scene-ideas/o.cc (+139/-0)
src/scene-ideas/s.cc (+130/-0)
src/scene-ideas/splines.cc (+200/-0)
src/scene-ideas/splines.h (+83/-0)
src/scene-ideas/t.cc (+147/-0)
src/scene-ideas/table.cc (+353/-0)
src/scene-ideas/table.h (+94/-0)
src/scene-jellyfish.cpp (+631/-0)
src/scene-jellyfish.h (+124/-0)
src/scene-loop.cpp (+179/-0)
src/scene-pulsar.cpp (+331/-0)
src/scene-refract.cpp (+483/-0)
src/scene-refract.h (+106/-0)
src/scene-shading.cpp (+353/-0)
src/scene-shadow.cpp (+560/-0)
src/scene-terrain.cpp (+362/-0)
src/scene-terrain/base-renderer.cpp (+144/-0)
src/scene-terrain/blur-renderer.cpp (+161/-0)
src/scene-terrain/copy-renderer.cpp (+55/-0)
src/scene-terrain/luminance-renderer.cpp (+57/-0)
src/scene-terrain/normal-from-height-renderer.cpp (+59/-0)
src/scene-terrain/overlay-renderer.cpp (+122/-0)
src/scene-terrain/renderer-chain.cpp (+115/-0)
src/scene-terrain/renderer.h (+348/-0)
src/scene-terrain/simplex-noise-renderer.cpp (+56/-0)
src/scene-terrain/terrain-renderer.cpp (+246/-0)
src/scene-terrain/texture-renderer.cpp (+69/-0)
src/scene-texture.cpp (+348/-0)
src/scene.cpp (+287/-0)
src/scene.h (+605/-0)
src/text-renderer.cpp (+292/-0)
src/text-renderer.h (+60/-0)
src/texture.cpp (+212/-0)
src/texture.h (+87/-0)
src/wscript_build (+81/-0)
waf (+162/-0)
waflib/Build.py (+731/-0)
waflib/ConfigSet.py (+151/-0)
waflib/Configure.py (+315/-0)
waflib/Context.py (+299/-0)
waflib/Errors.py (+37/-0)
waflib/Logs.py (+149/-0)
waflib/Node.py (+506/-0)
waflib/Options.py (+134/-0)
waflib/Runner.py (+197/-0)
waflib/Scripting.py (+367/-0)
waflib/Task.py (+672/-0)
waflib/TaskGen.py (+353/-0)
waflib/Tools/__init__.py (+4/-0)
waflib/Tools/ar.py (+12/-0)
waflib/Tools/asm.py (+25/-0)
waflib/Tools/bison.py (+29/-0)
waflib/Tools/c.py (+27/-0)
waflib/Tools/c_aliases.py (+56/-0)
waflib/Tools/c_config.py (+713/-0)
waflib/Tools/c_osx.py (+121/-0)
waflib/Tools/c_preproc.py (+606/-0)
waflib/Tools/c_tests.py (+146/-0)
waflib/Tools/ccroot.py (+375/-0)
waflib/Tools/compiler_c.py (+39/-0)
waflib/Tools/compiler_cxx.py (+39/-0)
waflib/Tools/compiler_d.py (+30/-0)
waflib/Tools/compiler_fc.py (+43/-0)
waflib/Tools/cs.py (+98/-0)
waflib/Tools/cxx.py (+27/-0)
waflib/Tools/d.py (+56/-0)
waflib/Tools/d_config.py (+47/-0)
waflib/Tools/d_scan.py (+133/-0)
waflib/Tools/dbus.py (+30/-0)
waflib/Tools/dmd.py (+47/-0)
waflib/Tools/errcheck.py (+161/-0)
waflib/Tools/fc.py (+123/-0)
waflib/Tools/fc_config.py (+283/-0)
waflib/Tools/fc_scan.py (+68/-0)
waflib/Tools/flex.py (+27/-0)
waflib/Tools/g95.py (+55/-0)
waflib/Tools/gas.py (+11/-0)
waflib/Tools/gcc.py (+98/-0)
waflib/Tools/gdc.py (+34/-0)
waflib/Tools/gfortran.py (+69/-0)
waflib/Tools/glib2.py (+174/-0)
waflib/Tools/gnu_dirs.py (+65/-0)
waflib/Tools/gxx.py (+98/-0)
waflib/Tools/icc.py (+31/-0)
waflib/Tools/icpc.py (+30/-0)
waflib/Tools/ifort.py (+49/-0)
waflib/Tools/intltool.py (+78/-0)
waflib/Tools/irixcc.py (+49/-0)
waflib/Tools/javaw.py (+275/-0)
waflib/Tools/kde4.py (+49/-0)
waflib/Tools/lua.py (+19/-0)
waflib/Tools/msvc.py (+654/-0)
waflib/Tools/nasm.py (+14/-0)
waflib/Tools/perl.py (+81/-0)
waflib/Tools/python.py (+336/-0)
waflib/Tools/qt4.py (+434/-0)
waflib/Tools/ruby.py (+104/-0)
waflib/Tools/suncc.py (+54/-0)
waflib/Tools/suncxx.py (+55/-0)
waflib/Tools/tex.py (+242/-0)
waflib/Tools/vala.py (+216/-0)
waflib/Tools/waf_unit_test.py (+79/-0)
waflib/Tools/winres.py (+34/-0)
waflib/Tools/xlc.py (+46/-0)
waflib/Tools/xlcxx.py (+46/-0)
waflib/Utils.py (+336/-0)
waflib/__init__.py (+4/-0)
waflib/ansiterm.py (+177/-0)
waflib/extras/__init__.py (+4/-0)
waflib/extras/compat15.py (+223/-0)
waflib/fixpy2.py (+50/-0)
wscript (+202/-0)
Branch information
Recent revisions
- 28. By Alexandros Frantzis
-
* New upstream release 2014.03.
* debian/control:
- Update Standards-Version to 3.9.5.
- Add binary packages for wayland, mir and drm variants.
* debian/rules:
- Build wayland, mir and drm variants.
- Programatically create .install and .manpages files for
variant binary packages. - 23. By Alexandros Frantzis
-
* New upstream release 2012.07.
* debian/changelog:
- Update dates to -2012 where needed.
- Add section for src/scene-ideas*.
- Add section for src/libjpeg-turbo/* . - 21. By Alexandros Frantzis
-
* New upstream release 2012.06.
* debian/rules:
- Clean compiled python code from unpacked waflib/ directory, as
described in http://wiki.debian. org/UnpackWaf . - 19. By Alexandros Frantzis
-
* debian/rules:
- Clean compiled python code from unpacked waflib/ directory, as
described in http://wiki.debian. org/UnpackWaf .
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/glmark2/2011.11