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

Committer: Package Import Robot
Author(s): Alexandros Frantzis
Date: 2011-09-22 11:32:17 UTC
mfrom: (1.1.3 upstream)
Revision ID: package-import@ubuntu.com-20110922113217-wvok1qgruexari8d

Tags: 2011.09-0ubuntu1

* New upstream release 2011.09.
* debian/control:
- Start the description of the glmark2-data package with
a lowercase letter.

files added:
INSTALL.android

android

android/Android.mk

android/AndroidManifest.xml

android/CleanSpec.mk

android/assets

android/default.properties

android/jni

android/jni/Android.mk

android/jni/Android.ndk.mk

android/jni/Application.mk

android/jni/src

android/res

android/res/values

android/res/values/strings.xml

android/src

android/src/org

android/src/org/linaro

android/src/org/linaro/glmark2

android/src/org/linaro/glmark2/Glmark2Activity.java

android/src/org/linaro/glmark2/Glmark2SurfaceView.java

data/models/bunny.obj

data/shaders/README.shaders

data/shaders/desktop-blur.frag

data/shaders/desktop.frag

data/shaders/desktop.vert

data/shaders/effect-2d-convolution.frag

data/shaders/effect-2d.vert

data/shaders/pulsar-light.vert

data/shaders/pulsar.vert

data/textures/desktop-window.png

data/textures/effect-2d.png

src/android.cpp

src/canvas-android.cpp

src/canvas-android.h

src/libpng

src/libpng/ANNOUNCE

src/libpng/CMakeLists.txt

src/libpng/INSTALL

src/libpng/KNOWNBUG

src/libpng/LICENSE

src/libpng/README

src/libpng/TODO

src/libpng/Y2KINFO

src/libpng/png.c

src/libpng/png.h

src/libpng/pngconf.h

src/libpng/pngerror.c

src/libpng/pnggccrd.c

src/libpng/pngget.c

src/libpng/pngmem.c

src/libpng/pngpread.c

src/libpng/pngread.c

src/libpng/pngrio.c

src/libpng/pngrtran.c

src/libpng/pngrutil.c

src/libpng/pngset.c

src/libpng/pngtrans.c

src/libpng/pngvcrd.c

src/libpng/pngwio.c

src/libpng/pngwrite.c

src/libpng/pngwtran.c

src/libpng/pngwutil.c

src/scene-desktop.cpp

src/scene-effect-2d.cpp

src/scene-pulsar.cpp

src/shader-source.cpp

src/shader-source.h

src/util.cpp

src/util.h

files modified:
NEWS

README

data/shaders/bump-normals.frag

data/shaders/bump-poly.frag

data/shaders/conditionals.frag

data/shaders/function.frag

data/shaders/light-advanced.frag

data/shaders/light-basic-tex.frag

data/shaders/light-basic.frag

data/shaders/light-basic.vert

data/shaders/light-phong.frag

data/shaders/loop.frag

debian/changelog

debian/control

debian/copyright

debian/rules

doc/glmark2.1.in

src/benchmark.cpp

src/canvas-x11.cpp

src/canvas-x11.h

src/canvas.h

src/libmatrix/Makefile

src/libmatrix/mat.h

src/libmatrix/program.cc

src/libmatrix/program.h

src/libmatrix/vec.h

src/log.cpp

src/main.cpp

src/model.cpp

src/model.h

src/options.cpp

src/options.h

src/scene-build.cpp

src/scene-bump.cpp

src/scene-conditionals.cpp

src/scene-function.cpp

src/scene-grid.cpp

src/scene-loop.cpp

src/scene-shading.cpp

src/scene-texture.cpp

src/scene.cpp

src/scene.h

src/texture.cpp

src/wscript_build

wscript

Show diffs side-by-side

added added

removed removed

src/shader-source.h

* This file is part of the glmark2 OpenGL (ES) 2.0 benchmark.

* glmark2 is free software: you can redistribute it and/or modify it under the

* terms of the GNU General Public License as published by the Free Software

* Foundation, either version 3 of the License, or (at your option) any later

* version.

* glmark2 is distributed in the hope that it will be useful, but WITHOUT ANY

* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS

* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more

* details.

* You should have received a copy of the GNU General Public License along with

* glmark2. If not, see <http://www.gnu.org/licenses/>.

* Authors:

* Alexandros Frantzis (glmark2)

#include <string>

#include <sstream>

#include <vector>

#include "vec.h"

#include "mat.h"

/**

* Helper class for loading and manipulating shader sources.

class ShaderSource

{

public:

enum ShaderType {

ShaderTypeVertex,

ShaderTypeFragment,

ShaderTypeUnknown

};

ShaderSource(ShaderType type = ShaderTypeUnknown) :

precision_has_been_set_(false), type_(type) {}

ShaderSource(const std::string &filename, ShaderType type = ShaderTypeUnknown) :

precision_has_been_set_(false), type_(type) { append_file(filename); }

void append(const std::string &str);

void append_file(const std::string &filename);

void replace(const std::string &remove, const std::string &insert);

void replace_with_file(const std::string &remove, const std::string &filename);

void add(const std::string &str, const std::string &function = "");

void add_const(const std::string &name, float f,