Updated GLI version used in GLM tests

This commit is contained in:
Christophe Riccio
2016-11-18 23:16:29 +01:00
parent 3440139d3a
commit 7e4007d427
134 changed files with 12089 additions and 4656 deletions

27
test/external/gli/load_ktx.hpp vendored Normal file
View File

@@ -0,0 +1,27 @@
/// @brief Include to load KTX textures from files or memory.
/// @file gli/load_ktx.hpp
#pragma once
#include "texture.hpp"
namespace gli
{
/// Loads a texture storage_linear from KTX file. Returns an empty storage_linear in case of failure.
///
/// @param Path Path of the file to open including filaname and filename extension
texture load_ktx(char const* Path);
/// Loads a texture storage_linear from KTX file. Returns an empty storage_linear in case of failure.
///
/// @param Path Path of the file to open including filaname and filename extension
texture load_ktx(std::string const& Path);
/// Loads a texture storage_linear from KTX memory. Returns an empty storage_linear in case of failure.
///
/// @param Data Pointer to the beginning of the texture container data to read
/// @param Size Size of texture container Data to read
texture load_ktx(char const* Data, std::size_t Size);
}//namespace gli
#include "./core/load_ktx.inl"