← Back to branch summary

~thomas-voss/glmark2/build-for-mir

~thomas-voss/glmark2/build-for-mir

Viewing all changes in revision 1.1.2.

Committer: Bazaar Package Importer
Author(s): Jani Monoses
Date: 2011-08-05 00:05:19 UTC
mto: This revision was merged to the branch mainline in revision 4.
Revision ID: james.westby@ubuntu.com-20110805000519-zit4dpe1wwzhnbg0

Tags: upstream-2011.07

Import upstream version 2011.07

files added:
data/models/asteroid-high.3ds

data/models/asteroid-low.3ds

data/shaders/bump-normals.frag

data/shaders/bump-normals.vert

data/shaders/bump-poly.frag

data/shaders/bump-poly.vert

data/shaders/conditionals-step-conditional.all

data/shaders/conditionals-step-simple.all

data/shaders/conditionals.frag

data/shaders/conditionals.vert

data/shaders/function-call.all

data/shaders/function-step-low.all

data/shaders/function-step-medium.all

data/shaders/function.frag

data/shaders/function.vert

data/shaders/light-phong.frag

data/shaders/light-phong.vert

data/shaders/loop-step-loop.all

data/shaders/loop-step-simple.all

data/shaders/loop.frag

data/shaders/loop.vert

data/textures/asteroid-normal-map.png

data/textures/crate-base.png

doc/glmark2.1.in

src/benchmark.cpp

src/benchmark.h

src/canvas-x11-egl.cpp

src/canvas-x11-egl.h

src/canvas-x11-glx.cpp

src/canvas-x11-glx.h

src/canvas-x11.cpp

src/canvas-x11.h

src/canvas.h

src/gl-headers.h

src/libmatrix

src/libmatrix/COPYING

src/libmatrix/Makefile

src/libmatrix/README

src/libmatrix/mat.cc

src/libmatrix/mat.h

src/libmatrix/matrix_inverse_test.cc

src/libmatrix/program.cc

src/libmatrix/program.h

src/libmatrix/stack.h

src/libmatrix/vec.h

src/log.cpp

src/log.h

src/options.cpp

src/options.h

src/scene-build.cpp

src/scene-bump.cpp

src/scene-conditionals.cpp

src/scene-default-options.cpp

src/scene-function.cpp

src/scene-grid.cpp

src/scene-loop.cpp

src/scene-shading.cpp

src/scene-texture.cpp

files removed:
data/textures/crate-base.bmp

doc/glmark2-es2.1

doc/glmark2.1

src/matrix.cpp

src/matrix.h

src/oglsdl.h

src/scenebuild.cpp

src/sceneshading.cpp

src/scenetexture.cpp

src/screen-sdl-gl.cpp

src/screen-sdl-gl.h

src/screen-sdl-glesv2.cpp

src/screen-sdl-glesv2.h

src/screen-sdl.cpp

src/screen-sdl.h

src/screen.h

src/sdlgles

src/sdlgles/SDL_gles.c

src/sdlgles/SDL_gles.h

src/sdlgles/attribs.inc

src/shader.cpp

src/shader.h

src/vector.cpp

src/vector.h

files modified:
NEWS

README

data/shaders/light-advanced.frag

data/shaders/light-advanced.vert

doc/wscript_build

src/main.cpp

src/mesh.cpp

src/mesh.h

src/model.cpp

src/model.h

src/scene.cpp

src/scene.h

src/texture.cpp

src/texture.h

src/wscript_build

wscript

Show diffs side-by-side

added added

removed removed

data/models/asteroid-high.3ds

data/models/asteroid-low.3ds

data/shaders/bump-normals.frag

data/shaders/bump-normals.vert

data/shaders/bump-poly.frag

data/shaders/bump-poly.vert

data/shaders/conditionals-step-conditional.all

data/shaders/conditionals-step-simple.all

data/shaders/conditionals.frag

data/shaders/conditionals.vert

data/shaders/function-call.all

data/shaders/function-step-low.all

data/shaders/function-step-medium.all

data/shaders/function.frag

data/shaders/function.vert

data/shaders/light-advanced.frag

data/shaders/light-advanced.vert

data/shaders/light-phong.frag

data/shaders/light-phong.vert

data/shaders/loop-step-loop.all

data/shaders/loop-step-simple.all

data/shaders/loop.frag

data/shaders/loop.vert

data/textures/asteroid-normal-map.png

data/textures/crate-base.bmp

data/textures/crate-base.png

doc/glmark2-es2.1

doc/glmark2.1.in

doc/wscript_build

src/benchmark.cpp

src/benchmark.h

src/canvas-x11-egl.cpp

src/canvas-x11-egl.h

src/canvas-x11-glx.cpp

src/canvas-x11-glx.h

src/canvas-x11.cpp

src/canvas-x11.h

src/gl-headers.h

src/libmatrix/COPYING

src/libmatrix/Makefile

src/libmatrix/README

src/libmatrix/mat.cc

src/libmatrix/mat.h

src/libmatrix/matrix_inverse_test.cc

src/libmatrix/program.cc

src/libmatrix/program.h

src/libmatrix/stack.h

src/libmatrix/vec.h

src/options.cpp

src/scene-build.cpp

src/scene-bump.cpp

src/scene-conditionals.cpp

src/scene-default-options.cpp

src/scene-function.cpp

src/scene-grid.cpp

src/scene-loop.cpp

src/scene-shading.cpp

src/scene-texture.cpp

src/scenebuild.cpp

src/sceneshading.cpp

src/scenetexture.cpp

src/screen-sdl-gl.cpp

src/screen-sdl-gl.h

src/screen-sdl-glesv2.cpp

src/screen-sdl-glesv2.h

src/screen-sdl.cpp

src/screen-sdl.h

src/sdlgles/SDL_gles.c

src/sdlgles/SDL_gles.h

src/sdlgles/attribs.inc

src/texture.cpp

src/wscript_build

Older »