Browse Source

Updates for cube map texture array support in ES 3.2.

pull/231/head
Vladimír Vondruš 9 years ago
parent
commit
c3ddbc89b6
  1. 2
      src/Magnum/AbstractFramebuffer.h
  2. 24
      src/Magnum/CubeMapTextureArray.h
  3. 2
      src/Magnum/Framebuffer.h

2
src/Magnum/AbstractFramebuffer.h

@ -685,7 +685,7 @@ class MAGNUM_EXPORT AbstractFramebuffer {
* @fn_gl_keyword{CopyTexSubImage3D} * @fn_gl_keyword{CopyTexSubImage3D}
* @requires_gl40 Extension @extension{ARB,texture_cube_map_array} * @requires_gl40 Extension @extension{ARB,texture_cube_map_array}
* @requires_gles30 Not defined in OpenGL ES 2.0. * @requires_gles30 Not defined in OpenGL ES 2.0.
* @requires_es_extension Extension @extension{ANDROID,extension_pack_es31a}/ * @requires_gles32 Extension @extension{ANDROID,extension_pack_es31a} /
* @extension{EXT,texture_cube_map_array} * @extension{EXT,texture_cube_map_array}
* @requires_gles Cube map texture arrays are not available in WebGL. * @requires_gles Cube map texture arrays are not available in WebGL.
*/ */

24
src/Magnum/CubeMapTextureArray.h

@ -83,7 +83,7 @@ more information about usage in shaders.
@ref MultisampleTexture @ref MultisampleTexture
@requires_gl40 Extension @extension{ARB,texture_cube_map_array} @requires_gl40 Extension @extension{ARB,texture_cube_map_array}
@requires_gles30 Not defined in OpenGL ES 2.0. @requires_gles30 Not defined in OpenGL ES 2.0.
@requires_es_extension Extension @extension{ANDROID,extension_pack_es31a}/ @requires_gles32 Extension @extension{ANDROID,extension_pack_es31a} /
@extension{EXT,texture_cube_map_array} @extension{EXT,texture_cube_map_array}
@requires_gles Cube map texture arrays are not available in WebGL. @requires_gles Cube map texture arrays are not available in WebGL.
*/ */
@ -153,12 +153,7 @@ class MAGNUM_EXPORT CubeMapTextureArray: public AbstractTexture {
* @fn_gl_keyword{CreateTextures} with @def_gl{TEXTURE_CUBE_MAP_ARRAY}, * @fn_gl_keyword{CreateTextures} with @def_gl{TEXTURE_CUBE_MAP_ARRAY},
* eventually @fn_gl_keyword{GenTextures} * eventually @fn_gl_keyword{GenTextures}
*/ */
explicit CubeMapTextureArray(): explicit CubeMapTextureArray(): AbstractTexture{GL_TEXTURE_CUBE_MAP_ARRAY} {}
#ifndef MAGNUM_TARGET_GLES
AbstractTexture{GL_TEXTURE_CUBE_MAP_ARRAY} {}
#else
AbstractTexture{GL_TEXTURE_CUBE_MAP_ARRAY_EXT} {}
#endif
/** /**
* @brief Construct without creating the underlying OpenGL object * @brief Construct without creating the underlying OpenGL object
@ -171,12 +166,7 @@ class MAGNUM_EXPORT CubeMapTextureArray: public AbstractTexture {
* destructing) objects even without any OpenGL context being active. * destructing) objects even without any OpenGL context being active.
* @see @ref CubeMapTextureArray(), @ref wrap() * @see @ref CubeMapTextureArray(), @ref wrap()
*/ */
explicit CubeMapTextureArray(NoCreateT) noexcept: explicit CubeMapTextureArray(NoCreateT) noexcept: AbstractTexture{NoCreate, GL_TEXTURE_CUBE_MAP_ARRAY} {}
#ifndef MAGNUM_TARGET_GLES
AbstractTexture{NoCreate, GL_TEXTURE_CUBE_MAP_ARRAY} {}
#else
AbstractTexture{NoCreate, GL_TEXTURE_CUBE_MAP_ARRAY_EXT} {}
#endif
/** /**
* @brief Bind level of given texture layer to given image unit * @brief Bind level of given texture layer to given image unit
@ -817,13 +807,7 @@ class MAGNUM_EXPORT CubeMapTextureArray: public AbstractTexture {
#endif #endif
private: private:
explicit CubeMapTextureArray(GLuint id, ObjectFlags flags) noexcept: AbstractTexture{id, explicit CubeMapTextureArray(GLuint id, ObjectFlags flags) noexcept: AbstractTexture{id, GL_TEXTURE_CUBE_MAP_ARRAY, flags} {}
#ifndef MAGNUM_TARGET_GLES
GL_TEXTURE_CUBE_MAP_ARRAY,
#else
GL_TEXTURE_CUBE_MAP_ARRAY_EXT,
#endif
flags} {}
}; };
} }

2
src/Magnum/Framebuffer.h

@ -775,7 +775,7 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje
/** @overload /** @overload
* @requires_gl40 Extension @extension{ARB,texture_cube_map_array} * @requires_gl40 Extension @extension{ARB,texture_cube_map_array}
* @requires_gles30 Not defined in OpenGL ES 2.0. * @requires_gles30 Not defined in OpenGL ES 2.0.
* @requires_es_extension Extension @extension{ANDROID,extension_pack_es31a}/ * @requires_gles32 Extension @extension{ANDROID,extension_pack_es31a} /
* @extension{EXT,texture_cube_map_array} * @extension{EXT,texture_cube_map_array}
* @requires_gles Cube map texture arrays are not available in WebGL. * @requires_gles Cube map texture arrays are not available in WebGL.
*/ */

Loading…
Cancel
Save