Updated GLI version used in GLM tests

test/external/gli/core/texture2d_array.inl

@@ -1,78 +1,79 @@
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// OpenGL Image Copyright (c) 2008 - 2011 G-Truc Creation (www.g-truc.net)
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Created : 2011-04-06
-// Updated : 2011-04-06
-// Licence : This source is under MIT License
-// File    : gli/core/texture_cube.inl
-///////////////////////////////////////////////////////////////////////////////////////////////////
+#include "../levels.hpp"
 
 namespace gli
 {
-	inline texture2DArray::texture2DArray()
+	inline texture2d_array::texture2d_array()
 	{}
 
-	inline texture2DArray::texture2DArray
-	(
-		texture2DArray::layer_type const & Layers, 
-		texture2DArray::level_type const & Levels
-	)
-	{
-		this->Arrays.resize(Layers);
-		for(texture2DArray::size_type i = 0; i < this->Arrays.size(); ++i)
-			this->Arrays[i].resize(Levels);
-	}
-
-	inline texture2DArray::~texture2DArray()
+	inline texture2d_array::texture2d_array(format_type Format, extent_type const& Extent, size_type Layers, swizzles_type const& Swizzles)
+		: texture(TARGET_2D_ARRAY, Format, texture::extent_type(Extent, 1), Layers, 1, gli::levels(Extent), Swizzles)
 	{}
 
-	inline texture2D & texture2DArray::operator[] 
+	inline texture2d_array::texture2d_array(format_type Format, extent_type const& Extent, size_type Layers, size_type Levels, swizzles_type const& Swizzles)
+		: texture(TARGET_2D_ARRAY, Format, texture::extent_type(Extent, 1), Layers, 1, Levels, Swizzles)
+	{}
+
+	inline texture2d_array::texture2d_array(texture const& Texture)
+		: texture(Texture, TARGET_2D_ARRAY, Texture.format())
+	{}
+
+	inline texture2d_array::texture2d_array
 	(
-		layer_type const & Layer
+		texture const& Texture,
+		format_type Format,
+		size_type BaseLayer, size_type MaxLayer,
+		size_type BaseFace, size_type MaxFace,
+		size_type BaseLevel, size_type MaxLevel,
+		swizzles_type const& Swizzles
 	)
-	{
-		return this->Arrays[Layer];
-	}
+		: texture(
+			Texture, TARGET_2D_ARRAY,
+			Format,
+			BaseLayer, MaxLayer,
+			BaseFace, MaxFace,
+			BaseLevel, MaxLevel,
+			Swizzles)
+	{}
 
-	inline texture2D const & texture2DArray::operator[] 
+	inline texture2d_array::texture2d_array
 	(
-		layer_type const & Layer
-	) const
-	{
-		return this->Arrays[Layer];
-	}
-
-	inline bool texture2DArray::empty() const
-	{
-		return this->Arrays.empty();
-	}
-
-	inline texture2DArray::format_type texture2DArray::format() const
-	{
-		return this->Arrays.empty() ? FORMAT_NULL : this->Arrays[0].format();
-	}
-
-	inline texture2DArray::layer_type texture2DArray::layers() const
-	{
-		return this->Arrays.size();
-	}
-
-	inline texture2DArray::level_type texture2DArray::levels() const
-	{
-		if(this->empty())
-			return 0;
-		return this->Arrays[0].levels();
-	}
-
-	inline void texture2DArray::resize
-	(
-		texture2DArray::layer_type const & Layers, 
-		texture2DArray::level_type const & Levels
+		texture2d_array const& Texture,
+		size_type BaseLayer, size_type MaxLayer,
+		size_type BaseLevel, size_type MaxLevel
 	)
+		: texture(
+			Texture, TARGET_2D_ARRAY,
+			Texture.format(),
+			Texture.base_layer() + BaseLayer, Texture.base_layer() + MaxLayer,
+			Texture.base_face(), Texture.max_face(),
+			Texture.base_level() + BaseLevel, Texture.base_level() + MaxLevel)
+	{}
+
+	inline texture2d texture2d_array::operator[](size_type Layer) const
 	{
-		this->Arrays.resize(Layers);
-		for(texture2DArray::layer_type i = 0; i < this->Arrays.size(); ++i)
-			this->Arrays[i].resize(Levels);
+		GLI_ASSERT(Layer < this->layers());
+
+		return texture2d(
+			*this, this->format(),
+			this->base_layer() + Layer, this->base_layer() + Layer,
+			this->base_face(), this->max_face(),
+			this->base_level(), this->max_level());
 	}
 
+	inline texture2d_array::extent_type texture2d_array::extent(size_type Level) const
+	{
+		return extent_type(this->texture::extent(Level));
+	}
+
+	template <typename gen_type>
+	inline gen_type texture2d_array::load(extent_type const& TexelCoord, size_type Layer, size_type Level) const
+	{
+		return this->texture::load<gen_type>(texture::extent_type(TexelCoord, 0), Layer, 0, Level);
+	}
+
+	template <typename gen_type>
+	inline void texture2d_array::store(extent_type const& TexelCoord, size_type Layer, size_type Level, gen_type const& Texel)
+	{
+		this->texture::store<gen_type>(texture::extent_type(TexelCoord, 0), Layer, 0, Level, Texel);
+	}
 }//namespace gli