Browse Source

Reworded array textures to be consistent with CubeMapTextureArray.

vectorfields
Vladimír Vondruš 14 years ago
parent
commit
2976b30922
  1. 4
      src/AbstractTexture.h
  2. 8
      src/Texture.h

4
src/AbstractTexture.h

@ -587,7 +587,7 @@ template<> struct AbstractTexture::DataHelper<1> {
template<> struct AbstractTexture::DataHelper<2> {
enum class Target: GLenum {
Texture2D = GL_TEXTURE_2D,
Array1D = GL_TEXTURE_1D_ARRAY,
Texture1DArray = GL_TEXTURE_1D_ARRAY,
Rectangle = GL_TEXTURE_RECTANGLE
};
@ -610,7 +610,7 @@ template<> struct AbstractTexture::DataHelper<2> {
template<> struct AbstractTexture::DataHelper<3> {
enum class Target: GLenum {
Texture3D = GL_TEXTURE_3D,
Array2D = GL_TEXTURE_2D_ARRAY
Texture2DArray = GL_TEXTURE_2D_ARRAY
};
inline constexpr static Target target() { return Target::Texture3D; }

8
src/Texture.h

@ -68,18 +68,18 @@ template<size_t textureDimensions> class Texture: public AbstractTexture {
Texture3D = GL_TEXTURE_3D, /**< Three-dimensional texture */
/**
* Array of one-dimensional textures (i.e. two dimensions in total)
* One-dimensional texture array (i.e. two dimensions in total)
*
* @requires_gl30 Extension <tt>EXT_texture_array</tt>
*/
Array1D = GL_TEXTURE_1D_ARRAY,
Texture1DArray = GL_TEXTURE_1D_ARRAY,
/**
* Array of two-dimensional textures (i.e. three dimensions in total)
* Two-dimensional texture array (i.e. three dimensions in total)
*
* @requires_gl30 Extension <tt>EXT_texture_array</tt>
*/
Array2D = GL_TEXTURE_2D_ARRAY,
Texture2DArray = GL_TEXTURE_2D_ARRAY,
/**
* Rectangle texture (i.e. two dimensions)

Loading…
Cancel
Save