~glcompbench-dev/glcompbench/blur-update

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/util.h

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

// this distribution, and is available at

// http://www.opensource.org/licenses/mit-license.php

// Contributors:

// Alexandros Frantzis <alexandros.frantzis@linaro.org>

// Jesse Barker <jesse.barker@linaro.org>

#ifndef UTIL_H_

#define UTIL_H_

#include <string>

#include <vector>

#include <istream>

#include <sstream>

#include <stdint.h>

#ifdef ANDROID

#include <android/asset_manager_jni.h>

#endif

struct Util {

static void split(const std::string &s, char delim, std::vector<std::string> &elems);

static uint64_t get_timestamp_us();

static std::istream *get_resource(const std::string &path);

static void list_files(const std::string& dirName, std::vector<std::string>& fileVec);

template <class T> static void dispose_pointer_vector(std::vector<T*> &vec)

{

for (typename std::vector<T*>::const_iterator iter = vec.begin();

iter != vec.end();

iter++)

{

delete *iter;

}

vec.clear();

}

template<typename T>

static T

fromString(const std::string& asString)

{

std::stringstream ss(asString);

T retVal;

ss >> retVal;

return retVal;

}

template<typename T>

static std::string

toString(const T t)

{

std::stringstream ss;

ss << t;

return ss.str();

}

static std::string

appname_from_path(const std::string& path);

#ifdef ANDROID

static void android_set_asset_manager(AAssetManager *asset_manager);

static AAssetManager *android_get_asset_manager(void);

private:

static AAssetManager *android_asset_manager;

#endif

};

#endif /* UTIL_H */

Older »