Merge branch '0.9.8'

This commit is contained in:
Christophe Riccio
2016-11-20 23:04:25 +01:00
3 changed files with 24 additions and 25 deletions

View File

@@ -4,10 +4,10 @@
#if GLM_LANG & GLM_LANG_CXX11_FLAG
#include <gli/gli.hpp>
std::size_t const Size = 64;
int test_simplex()
{
std::size_t const Size = 256;
{
gli::texture2d Texture(gli::FORMAT_RGBA8_UNORM_PACK8, gli::texture2d::extent_type(Size), 1);
@@ -55,8 +55,6 @@ int test_simplex()
int test_perlin()
{
std::size_t const Size = 256;
{
gli::texture2d Texture(gli::FORMAT_RGBA8_UNORM_PACK8, gli::texture2d::extent_type(Size), 1);
@@ -104,8 +102,6 @@ int test_perlin()
int test_perlin_pedioric()
{
std::size_t const Size = 256;
{
gli::texture2d Texture(gli::FORMAT_RGBA8_UNORM_PACK8, gli::texture2d::extent_type(Size), 1);