~glcompbench-dev/glcompbench/blur-update

Viewing changes to src/libmatrix/program.h

Committer: Jesse Barker
Date: 2012-01-27 22:26:02 UTC
mfrom: (74.1.5 libmatrix-util)
Revision ID: jesse.barker@linaro.org-20120127222602-osainr4na7opoiij

Merge of lp:~glcompbench-dev/glcompbench/libmatrix-util.

Updates glcompbench to reflect the latest lp:libmatrix, which, in and of itself,
conslidates code previously duplicated between glcompbench and glmark2 into
libmatrix.

files added:
src/libmatrix/gl-if.h

src/libmatrix/log.cc

src/libmatrix/log.h

src/libmatrix/shader-source.cc

src/libmatrix/shader-source.h

src/libmatrix/test/basic-global-const.vert

src/libmatrix/test/basic.frag

src/libmatrix/test/basic.vert

src/libmatrix/test/const_vec_test.cc

src/libmatrix/test/const_vec_test.h

src/libmatrix/test/shader_source_test.cc

src/libmatrix/test/shader_source_test.h

src/libmatrix/test/transpose_test.cc

src/libmatrix/test/transpose_test.h

src/libmatrix/util.cc

src/libmatrix/util.h

files removed:
src/log.cc

src/log.h

src/shader-source.cc

src/shader-source.h

src/util.cc

src/util.h

files modified:
src/glcompbench.cc

src/libmatrix/Makefile

src/libmatrix/mat.h

src/libmatrix/program.cc

src/libmatrix/program.h

src/libmatrix/test/inverse_test.cc

src/libmatrix/test/inverse_test.h

src/libmatrix/test/libmatrix_test.cc

src/libmatrix/test/libmatrix_test.h

src/libmatrix/test/options.cc

src/libmatrix/vec.h

Show diffs side-by-side

added added

removed removed

src/libmatrix/program.h

// are made available under the terms of the MIT License which accompanies

// Contributors:

// Jesse Barker - original implementation.

// Alexandros Frantzis - local integration changes

#ifndef PROGRAM_H_

#define PROGRAM_H_

161

162

bool valid_;

162

163

};

163

164

// Handy utility for extracting shader source from a named file

165

bool gotSource(const std::string& filename, std::string& sourceOut);

166

167

165

#endif // PROGRAM_H_

Older »