ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Mutable image views can be passed via const&. 

We're not changing the view parameters, only writing to the memory it
points to.
pull/364/head
Vladimír Vondruš 7 years ago
parent
bd1ce7d316
commit
b0def187ae
10 changed files with 51 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/Magnum/GL/AbstractFramebuffer.cpp
  2. 2
      src/Magnum/GL/AbstractFramebuffer.h
  3. 35
      src/Magnum/GL/AbstractTexture.cpp
  4. 8
      src/Magnum/GL/AbstractTexture.h
  5. 10
      src/Magnum/GL/CubeMapTexture.cpp
  6. 12
      src/Magnum/GL/CubeMapTexture.h
  7. 8
      src/Magnum/GL/CubeMapTextureArray.h
  8. 8
      src/Magnum/GL/RectangleTexture.h
  9. 8
      src/Magnum/GL/Texture.h
  10. 8
      src/Magnum/GL/TextureArray.h

5
src/Magnum/GL/AbstractFramebuffer.cpp
Unescape View File

@ -335,7 +335,7 @@ AbstractFramebuffer& AbstractFramebuffer::clearDepthStencil(const Float depth, c
} }
#endif #endif
void AbstractFramebuffer::read(const Range2Di& rectangle, MutableImageView2D& image) { void AbstractFramebuffer::read(const Range2Di& rectangle, const MutableImageView2D& image) {
CORRADE_ASSERT(image.data().data() != nullptr, CORRADE_ASSERT(image.data().data() != nullptr,
"GL::AbstractFramebuffer::read(): image view is nullptr", ); "GL::AbstractFramebuffer::read(): image view is nullptr", );
CORRADE_ASSERT(image.size() == rectangle.size(), CORRADE_ASSERT(image.size() == rectangle.size(),
@ -362,8 +362,7 @@ void AbstractFramebuffer::read(const Range2Di& rectangle, Image2D& image) {
/* Replace the storage, proxy to the function taking a view */ /* Replace the storage, proxy to the function taking a view */
image = Image2D{image.storage(), image.format(), image.formatExtra(), image.pixelSize(), rectangle.size(), std::move(data)}; image = Image2D{image.storage(), image.format(), image.formatExtra(), image.pixelSize(), rectangle.size(), std::move(data)};
MutableImageView2D view(image); read(rectangle, MutableImageView2D(image));
read(rectangle, view);
} }
Image2D AbstractFramebuffer::read(const Range2Di& rectangle, Image2D&& image) { Image2D AbstractFramebuffer::read(const Range2Di& rectangle, Image2D&& image) {

2
src/Magnum/GL/AbstractFramebuffer.h
Unescape View File

@ -415,7 +415,7 @@ class MAGNUM_GL_EXPORT AbstractFramebuffer {
* it's not @cpp nullptr @ce and its size is the same as @p rectangle * it's not @cpp nullptr @ce and its size is the same as @p rectangle
* size. * size.
*/ */
void read(const Range2Di& rectangle, MutableImageView2D& image); void read(const Range2Di& rectangle, const MutableImageView2D& image);
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
/** /**

35
src/Magnum/GL/AbstractTexture.cpp
Unescape View File

@ -1602,7 +1602,7 @@ template void MAGNUM_GL_EXPORT AbstractTexture::image<1>(GLint, Image<1>&);
template void MAGNUM_GL_EXPORT AbstractTexture::image<2>(GLint, Image<2>&); template void MAGNUM_GL_EXPORT AbstractTexture::image<2>(GLint, Image<2>&);
template void MAGNUM_GL_EXPORT AbstractTexture::image<3>(GLint, Image<3>&); template void MAGNUM_GL_EXPORT AbstractTexture::image<3>(GLint, Image<3>&);
template<UnsignedInt dimensions> void AbstractTexture::image(GLint level, BasicMutableImageView<dimensions>& image) { template<UnsignedInt dimensions> void AbstractTexture::image(GLint level, const BasicMutableImageView<dimensions>& image) {
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
const Math::Vector<dimensions, Int> size = DataHelper<dimensions>::imageSize(*this, level); const Math::Vector<dimensions, Int> size = DataHelper<dimensions>::imageSize(*this, level);
CORRADE_ASSERT(image.data().data() != nullptr, CORRADE_ASSERT(image.data().data() != nullptr,
@ -1616,9 +1616,9 @@ template<UnsignedInt dimensions> void AbstractTexture::image(GLint level, BasicM
(this->*Context::current().state().texture->getImageImplementation)(level, pixelFormat(image.format()), pixelType(image.format(), image.formatExtra()), image.data().size(), image.data()); (this->*Context::current().state().texture->getImageImplementation)(level, pixelFormat(image.format()), pixelType(image.format(), image.formatExtra()), image.data().size(), image.data());
} }
template void MAGNUM_GL_EXPORT AbstractTexture::image<1>(GLint, BasicMutableImageView<1>&); template void MAGNUM_GL_EXPORT AbstractTexture::image<1>(GLint, const BasicMutableImageView<1>&);
template void MAGNUM_GL_EXPORT AbstractTexture::image<2>(GLint, BasicMutableImageView<2>&); template void MAGNUM_GL_EXPORT AbstractTexture::image<2>(GLint, const BasicMutableImageView<2>&);
template void MAGNUM_GL_EXPORT AbstractTexture::image<3>(GLint, BasicMutableImageView<3>&); template void MAGNUM_GL_EXPORT AbstractTexture::image<3>(GLint, const BasicMutableImageView<3>&);
template<UnsignedInt dimensions> void AbstractTexture::image(GLint level, BufferImage<dimensions>& image, BufferUsage usage) { template<UnsignedInt dimensions> void AbstractTexture::image(GLint level, BufferImage<dimensions>& image, BufferUsage usage) {
const Math::Vector<dimensions, Int> size = DataHelper<dimensions>::imageSize(*this, level); const Math::Vector<dimensions, Int> size = DataHelper<dimensions>::imageSize(*this, level);
@ -1670,7 +1670,7 @@ template void MAGNUM_GL_EXPORT AbstractTexture::compressedImage<1>(GLint, Compre
template void MAGNUM_GL_EXPORT AbstractTexture::compressedImage<2>(GLint, CompressedImage<2>&); template void MAGNUM_GL_EXPORT AbstractTexture::compressedImage<2>(GLint, CompressedImage<2>&);
template void MAGNUM_GL_EXPORT AbstractTexture::compressedImage<3>(GLint, CompressedImage<3>&); template void MAGNUM_GL_EXPORT AbstractTexture::compressedImage<3>(GLint, CompressedImage<3>&);
template<UnsignedInt dimensions> void AbstractTexture::compressedImage(const GLint level, BasicMutableCompressedImageView<dimensions>& image) { template<UnsignedInt dimensions> void AbstractTexture::compressedImage(const GLint level, const BasicMutableCompressedImageView<dimensions>& image) {
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
CORRADE_ASSERT(image.data().data() != nullptr, CORRADE_ASSERT(image.data().data() != nullptr,
"GL::AbstractTexture::compressedImage(): image view is nullptr", ); "GL::AbstractTexture::compressedImage(): image view is nullptr", );
@ -1705,9 +1705,9 @@ template<UnsignedInt dimensions> void AbstractTexture::compressedImage(const GLi
(this->*Context::current().state().texture->getCompressedImageImplementation)(level, image.data().size(), image.data()); (this->*Context::current().state().texture->getCompressedImageImplementation)(level, image.data().size(), image.data());
} }
template void MAGNUM_GL_EXPORT AbstractTexture::compressedImage<1>(GLint, BasicMutableCompressedImageView<1>&); template void MAGNUM_GL_EXPORT AbstractTexture::compressedImage<1>(GLint, const BasicMutableCompressedImageView<1>&);
template void MAGNUM_GL_EXPORT AbstractTexture::compressedImage<2>(GLint, BasicMutableCompressedImageView<2>&); template void MAGNUM_GL_EXPORT AbstractTexture::compressedImage<2>(GLint, const BasicMutableCompressedImageView<2>&);
template void MAGNUM_GL_EXPORT AbstractTexture::compressedImage<3>(GLint, BasicMutableCompressedImageView<3>&); template void MAGNUM_GL_EXPORT AbstractTexture::compressedImage<3>(GLint, const BasicMutableCompressedImageView<3>&);
template<UnsignedInt dimensions> void AbstractTexture::compressedImage(const GLint level, CompressedBufferImage<dimensions>& image, BufferUsage usage) { template<UnsignedInt dimensions> void AbstractTexture::compressedImage(const GLint level, CompressedBufferImage<dimensions>& image, BufferUsage usage) {
const Math::Vector<dimensions, Int> size = DataHelper<dimensions>::imageSize(*this, level); const Math::Vector<dimensions, Int> size = DataHelper<dimensions>::imageSize(*this, level);
@ -1749,15 +1749,14 @@ template<UnsignedInt dimensions> void AbstractTexture::subImage(const GLint leve
data = Containers::Array<char>{dataSize}; data = Containers::Array<char>{dataSize};
image = Image<dimensions>{image.storage(), image.format(), image.formatExtra(), image.pixelSize(), size, std::move(data)}; image = Image<dimensions>{image.storage(), image.format(), image.formatExtra(), image.pixelSize(), size, std::move(data)};
BasicMutableImageView<dimensions> view(image); subImage(level, range, BasicMutableImageView<dimensions>(image));
subImage(level, range, view);
} }
template void MAGNUM_GL_EXPORT AbstractTexture::subImage<1>(GLint, const Range1Di&, Image<1>&); template void MAGNUM_GL_EXPORT AbstractTexture::subImage<1>(GLint, const Range1Di&, Image<1>&);
template void MAGNUM_GL_EXPORT AbstractTexture::subImage<2>(GLint, const Range2Di&, Image<2>&); template void MAGNUM_GL_EXPORT AbstractTexture::subImage<2>(GLint, const Range2Di&, Image<2>&);
template void MAGNUM_GL_EXPORT AbstractTexture::subImage<3>(GLint, const Range3Di&, Image<3>&); template void MAGNUM_GL_EXPORT AbstractTexture::subImage<3>(GLint, const Range3Di&, Image<3>&);
template<UnsignedInt dimensions> void AbstractTexture::subImage(const GLint level, const RangeTypeFor<dimensions, Int>& range, BasicMutableImageView<dimensions>& image) { template<UnsignedInt dimensions> void AbstractTexture::subImage(const GLint level, const RangeTypeFor<dimensions, Int>& range, const BasicMutableImageView<dimensions>& image) {
CORRADE_ASSERT(image.data().data() != nullptr, CORRADE_ASSERT(image.data().data() != nullptr,
"GL::AbstractTexture::subImage(): image view is nullptr", ); "GL::AbstractTexture::subImage(): image view is nullptr", );
CORRADE_ASSERT(image.size() == range.size(), CORRADE_ASSERT(image.size() == range.size(),
@ -1774,9 +1773,9 @@ template<UnsignedInt dimensions> void AbstractTexture::subImage(const GLint leve
glGetTextureSubImage(_id, level, paddedOffset.x(), paddedOffset.y(), paddedOffset.z(), paddedSize.x(), paddedSize.y(), paddedSize.z(), GLenum(pixelFormat(image.format())), GLenum(pixelType(image.format(), image.formatExtra())), image.data().size(), image.data()); glGetTextureSubImage(_id, level, paddedOffset.x(), paddedOffset.y(), paddedOffset.z(), paddedSize.x(), paddedSize.y(), paddedSize.z(), GLenum(pixelFormat(image.format())), GLenum(pixelType(image.format(), image.formatExtra())), image.data().size(), image.data());
} }
template void MAGNUM_GL_EXPORT AbstractTexture::subImage<1>(GLint, const Range1Di&, BasicMutableImageView<1>&); template void MAGNUM_GL_EXPORT AbstractTexture::subImage<1>(GLint, const Range1Di&, const BasicMutableImageView<1>&);
template void MAGNUM_GL_EXPORT AbstractTexture::subImage<2>(GLint, const Range2Di&, BasicMutableImageView<2>&); template void MAGNUM_GL_EXPORT AbstractTexture::subImage<2>(GLint, const Range2Di&, const BasicMutableImageView<2>&);
template void MAGNUM_GL_EXPORT AbstractTexture::subImage<3>(GLint, const Range3Di&, BasicMutableImageView<3>&); template void MAGNUM_GL_EXPORT AbstractTexture::subImage<3>(GLint, const Range3Di&, const BasicMutableImageView<3>&);
template<UnsignedInt dimensions> void AbstractTexture::subImage(const GLint level, const RangeTypeFor<dimensions, Int>& range, BufferImage<dimensions>& image, const BufferUsage usage) { template<UnsignedInt dimensions> void AbstractTexture::subImage(const GLint level, const RangeTypeFor<dimensions, Int>& range, BufferImage<dimensions>& image, const BufferUsage usage) {
createIfNotAlready(); createIfNotAlready();
@ -1847,7 +1846,7 @@ template void MAGNUM_GL_EXPORT AbstractTexture::compressedSubImage<1>(GLint, con
template void MAGNUM_GL_EXPORT AbstractTexture::compressedSubImage<2>(GLint, const Range2Di&, CompressedImage<2>&); template void MAGNUM_GL_EXPORT AbstractTexture::compressedSubImage<2>(GLint, const Range2Di&, CompressedImage<2>&);
template void MAGNUM_GL_EXPORT AbstractTexture::compressedSubImage<3>(GLint, const Range3Di&, CompressedImage<3>&); template void MAGNUM_GL_EXPORT AbstractTexture::compressedSubImage<3>(GLint, const Range3Di&, CompressedImage<3>&);
template<UnsignedInt dimensions> void AbstractTexture::compressedSubImage(const GLint level, const RangeTypeFor<dimensions, Int>& range, BasicMutableCompressedImageView<dimensions>& image) { template<UnsignedInt dimensions> void AbstractTexture::compressedSubImage(const GLint level, const RangeTypeFor<dimensions, Int>& range, const BasicMutableCompressedImageView<dimensions>& image) {
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
CORRADE_ASSERT(image.data().data() != nullptr, CORRADE_ASSERT(image.data().data() != nullptr,
"GL::AbstractTexture::compressedSubImage(): image view is nullptr", ); "GL::AbstractTexture::compressedSubImage(): image view is nullptr", );
@ -1885,9 +1884,9 @@ template<UnsignedInt dimensions> void AbstractTexture::compressedSubImage(const
glGetCompressedTextureSubImage(_id, level, paddedOffset.x(), paddedOffset.y(), paddedOffset.z(), paddedSize.x(), paddedSize.y(), paddedSize.z(), image.data().size(), image.data()); glGetCompressedTextureSubImage(_id, level, paddedOffset.x(), paddedOffset.y(), paddedOffset.z(), paddedSize.x(), paddedSize.y(), paddedSize.z(), image.data().size(), image.data());
} }
template void MAGNUM_GL_EXPORT AbstractTexture::compressedSubImage<1>(GLint, const Range1Di&, BasicMutableCompressedImageView<1>&); template void MAGNUM_GL_EXPORT AbstractTexture::compressedSubImage<1>(GLint, const Range1Di&, const BasicMutableCompressedImageView<1>&);
template void MAGNUM_GL_EXPORT AbstractTexture::compressedSubImage<2>(GLint, const Range2Di&, BasicMutableCompressedImageView<2>&); template void MAGNUM_GL_EXPORT AbstractTexture::compressedSubImage<2>(GLint, const Range2Di&, const BasicMutableCompressedImageView<2>&);
template void MAGNUM_GL_EXPORT AbstractTexture::compressedSubImage<3>(GLint, const Range3Di&, BasicMutableCompressedImageView<3>&); template void MAGNUM_GL_EXPORT AbstractTexture::compressedSubImage<3>(GLint, const Range3Di&, const BasicMutableCompressedImageView<3>&);
template<UnsignedInt dimensions> void AbstractTexture::compressedSubImage(const GLint level, const RangeTypeFor<dimensions, Int>& range, CompressedBufferImage<dimensions>& image, const BufferUsage usage) { template<UnsignedInt dimensions> void AbstractTexture::compressedSubImage(const GLint level, const RangeTypeFor<dimensions, Int>& range, CompressedBufferImage<dimensions>& image, const BufferUsage usage) {
createIfNotAlready(); createIfNotAlready();

8
src/Magnum/GL/AbstractTexture.h
Unescape View File

@ -489,16 +489,16 @@ class MAGNUM_GL_EXPORT AbstractTexture: public AbstractObject {
void generateMipmap(); void generateMipmap();
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
template<UnsignedInt dimensions> void image(GLint level, BasicMutableImageView<dimensions>& image); template<UnsignedInt dimensions> void image(GLint level, const BasicMutableImageView<dimensions>& image);
template<UnsignedInt dimensions> void image(GLint level, Image<dimensions>& image); template<UnsignedInt dimensions> void image(GLint level, Image<dimensions>& image);
template<UnsignedInt dimensions> void image(GLint level, BufferImage<dimensions>& image, BufferUsage usage); template<UnsignedInt dimensions> void image(GLint level, BufferImage<dimensions>& image, BufferUsage usage);
template<UnsignedInt dimensions> void compressedImage(GLint level, BasicMutableCompressedImageView<dimensions>& image); template<UnsignedInt dimensions> void compressedImage(GLint level, const BasicMutableCompressedImageView<dimensions>& image);
template<UnsignedInt dimensions> void compressedImage(GLint level, CompressedImage<dimensions>& image); template<UnsignedInt dimensions> void compressedImage(GLint level, CompressedImage<dimensions>& image);
template<UnsignedInt dimensions> void compressedImage(GLint level, CompressedBufferImage<dimensions>& image, BufferUsage usage); template<UnsignedInt dimensions> void compressedImage(GLint level, CompressedBufferImage<dimensions>& image, BufferUsage usage);
template<UnsignedInt dimensions> void subImage(GLint level, const RangeTypeFor<dimensions, Int>& range, BasicMutableImageView<dimensions>& image); template<UnsignedInt dimensions> void subImage(GLint level, const RangeTypeFor<dimensions, Int>& range, const BasicMutableImageView<dimensions>& image);
template<UnsignedInt dimensions> void subImage(GLint level, const RangeTypeFor<dimensions, Int>& range, Image<dimensions>& image); template<UnsignedInt dimensions> void subImage(GLint level, const RangeTypeFor<dimensions, Int>& range, Image<dimensions>& image);
template<UnsignedInt dimensions> void subImage(GLint level, const RangeTypeFor<dimensions, Int>& range, BufferImage<dimensions>& image, BufferUsage usage); template<UnsignedInt dimensions> void subImage(GLint level, const RangeTypeFor<dimensions, Int>& range, BufferImage<dimensions>& image, BufferUsage usage);
template<UnsignedInt dimensions> void compressedSubImage(GLint level, const RangeTypeFor<dimensions, Int>& range, BasicMutableCompressedImageView<dimensions>& image); template<UnsignedInt dimensions> void compressedSubImage(GLint level, const RangeTypeFor<dimensions, Int>& range, const BasicMutableCompressedImageView<dimensions>& image);
template<UnsignedInt dimensions> void compressedSubImage(GLint level, const RangeTypeFor<dimensions, Int>& range, CompressedImage<dimensions>& image); template<UnsignedInt dimensions> void compressedSubImage(GLint level, const RangeTypeFor<dimensions, Int>& range, CompressedImage<dimensions>& image);
template<UnsignedInt dimensions> void compressedSubImage(GLint level, const RangeTypeFor<dimensions, Int>& range, CompressedBufferImage<dimensions>& image, BufferUsage usage); template<UnsignedInt dimensions> void compressedSubImage(GLint level, const RangeTypeFor<dimensions, Int>& range, CompressedBufferImage<dimensions>& image, BufferUsage usage);
#endif #endif

10
src/Magnum/GL/CubeMapTexture.cpp
Unescape View File

@ -85,7 +85,7 @@ Image3D CubeMapTexture::image(const Int level, Image3D&& image) {
return std::move(image); return std::move(image);
} }
void CubeMapTexture::image(const Int level, MutableImageView3D& image) { void CubeMapTexture::image(const Int level, const MutableImageView3D& image) {
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
const Vector3i size{imageSize(level), 6}; const Vector3i size{imageSize(level), 6};
CORRADE_ASSERT(image.data().data() != nullptr, CORRADE_ASSERT(image.data().data() != nullptr,
@ -154,7 +154,7 @@ CompressedImage3D CubeMapTexture::compressedImage(const Int level, CompressedIma
return std::move(image); return std::move(image);
} }
void CubeMapTexture::compressedImage(const Int level, MutableCompressedImageView3D& image) { void CubeMapTexture::compressedImage(const Int level, const MutableCompressedImageView3D& image) {
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
CORRADE_ASSERT(image.data().data() != nullptr, CORRADE_ASSERT(image.data().data() != nullptr,
"GL::CubeMapTexture::compressedImage(): image view is nullptr", ); "GL::CubeMapTexture::compressedImage(): image view is nullptr", );
@ -241,7 +241,7 @@ Image2D CubeMapTexture::image(const CubeMapCoordinate coordinate, const Int leve
return std::move(image); return std::move(image);
} }
void CubeMapTexture::image(const CubeMapCoordinate coordinate, const Int level, MutableImageView2D& image) { void CubeMapTexture::image(const CubeMapCoordinate coordinate, const Int level, const MutableImageView2D& image) {
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
const Vector2i size = imageSize(level); const Vector2i size = imageSize(level);
CORRADE_ASSERT(image.data().data() != nullptr, CORRADE_ASSERT(image.data().data() != nullptr,
@ -308,7 +308,7 @@ CompressedImage2D CubeMapTexture::compressedImage(const CubeMapCoordinate coordi
return std::move(image); return std::move(image);
} }
void CubeMapTexture::compressedImage(const CubeMapCoordinate coordinate, const Int level, MutableCompressedImageView2D& image) { void CubeMapTexture::compressedImage(const CubeMapCoordinate coordinate, const Int level, const MutableCompressedImageView2D& image) {
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
CORRADE_ASSERT(image.data().data() != nullptr, CORRADE_ASSERT(image.data().data() != nullptr,
"GL::CubeMapTexture::compressedImage(): image view is nullptr", ); "GL::CubeMapTexture::compressedImage(): image view is nullptr", );
@ -420,7 +420,7 @@ CompressedImage3D CubeMapTexture::compressedSubImage(const Int level, const Rang
return std::move(image); return std::move(image);
} }
void CubeMapTexture::compressedSubImage(const Int level, const Range3Di& range, MutableCompressedImageView3D& image) { void CubeMapTexture::compressedSubImage(const Int level, const Range3Di& range, const MutableCompressedImageView3D& image) {
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
CORRADE_ASSERT(image.data().data() != nullptr, CORRADE_ASSERT(image.data().data() != nullptr,
"GL::CubeMapTexture::compressedSubImage(): image view is nullptr", ); "GL::CubeMapTexture::compressedSubImage(): image view is nullptr", );

12
src/Magnum/GL/CubeMapTexture.h
Unescape View File

@ -572,7 +572,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
* into the memory provided by @p image, expecting it's not * into the memory provided by @p image, expecting it's not
* @cpp nullptr @ce and its size is the same as size of given @p level. * @cpp nullptr @ce and its size is the same as size of given @p level.
*/ */
void image(Int level, MutableImageView3D& image); void image(Int level, const MutableImageView3D& image);
/** /**
* @brief Read given texture mip level to a buffer image * @brief Read given texture mip level to a buffer image
@ -631,7 +631,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
* expecting it's not @cpp nullptr @ce, its format is the same as * expecting it's not @cpp nullptr @ce, its format is the same as
* texture format and its size is the same as size of given @p level. * texture format and its size is the same as size of given @p level.
*/ */
void compressedImage(Int level, MutableCompressedImageView3D& image); void compressedImage(Int level, const MutableCompressedImageView3D& image);
/** /**
* @brief Read given compressed texture mip level to a buffer image * @brief Read given compressed texture mip level to a buffer image
@ -698,7 +698,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
* expecting it's not @cpp nullptr @ce and its size is the same as size * expecting it's not @cpp nullptr @ce and its size is the same as size
* of given @p level. * of given @p level.
*/ */
void image(CubeMapCoordinate coordinate, Int level, MutableImageView2D& image); void image(CubeMapCoordinate coordinate, Int level, const MutableImageView2D& image);
/** /**
* @brief Read given texture mip level and coordinate to a buffer image * @brief Read given texture mip level and coordinate to a buffer image
@ -764,7 +764,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
* expecting it's not @cpp nullptr @ce, its format is the same as * expecting it's not @cpp nullptr @ce, its format is the same as
* texture format and its size is the same as size of given @p level. * texture format and its size is the same as size of given @p level.
*/ */
void compressedImage(CubeMapCoordinate coordinate, Int level, MutableCompressedImageView2D& image); void compressedImage(CubeMapCoordinate coordinate, Int level, const MutableCompressedImageView2D& image);
/** /**
* @brief Read given compressed texture mip level and coordinate to a buffer image * @brief Read given compressed texture mip level and coordinate to a buffer image
@ -819,7 +819,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
* expecting it's not @cpp nullptr @ce and its size is the same as * expecting it's not @cpp nullptr @ce and its size is the same as
* @p range size. * @p range size.
*/ */
void subImage(Int level, const Range3Di& range, MutableImageView3D& image) { void subImage(Int level, const Range3Di& range, const MutableImageView3D& image) {
AbstractTexture::subImage<3>(level, range, image); AbstractTexture::subImage<3>(level, range, image);
} }
@ -879,7 +879,7 @@ class MAGNUM_GL_EXPORT CubeMapTexture: public AbstractTexture {
* expecting it's not @cpp nullptr @ce, its format is the same as * expecting it's not @cpp nullptr @ce, its format is the same as
* texture format and its size is the same as @p range size. * texture format and its size is the same as @p range size.
*/ */
void compressedSubImage(Int level, const Range3Di& range, MutableCompressedImageView3D& image); void compressedSubImage(Int level, const Range3Di& range, const MutableCompressedImageView3D& image);
/** /**
* @brief Read a range of given compressed texture mip level to a buffer image * @brief Read a range of given compressed texture mip level to a buffer image

8
src/Magnum/GL/CubeMapTextureArray.h
Unescape View File

@ -492,7 +492,7 @@ class MAGNUM_GL_EXPORT CubeMapTextureArray: public AbstractTexture {
* into the memory provided by @p image, expecting it's not * into the memory provided by @p image, expecting it's not
* @cpp nullptr @ce and its size is the same as size of given @p level. * @cpp nullptr @ce and its size is the same as size of given @p level.
*/ */
void image(Int level, MutableImageView3D& image) { void image(Int level, const MutableImageView3D& image) {
AbstractTexture::image<3>(level, image); AbstractTexture::image<3>(level, image);
} }
@ -548,7 +548,7 @@ class MAGNUM_GL_EXPORT CubeMapTextureArray: public AbstractTexture {
* expecting it's not @cpp nullptr @ce, its format is the same as * expecting it's not @cpp nullptr @ce, its format is the same as
* texture format and its size is the same as size of given @p level. * texture format and its size is the same as size of given @p level.
*/ */
void compressedImage(Int level, MutableCompressedImageView3D& image) { void compressedImage(Int level, const MutableCompressedImageView3D& image) {
AbstractTexture::compressedImage<3>(level, image); AbstractTexture::compressedImage<3>(level, image);
} }
@ -605,7 +605,7 @@ class MAGNUM_GL_EXPORT CubeMapTextureArray: public AbstractTexture {
* expecting it's not @cpp nullptr @ce and its size is the same as * expecting it's not @cpp nullptr @ce and its size is the same as
* @p range size. * @p range size.
*/ */
void subImage(Int level, const Range3Di& range, MutableImageView3D& image) { void subImage(Int level, const Range3Di& range, const MutableImageView3D& image) {
AbstractTexture::subImage<3>(level, range, image); AbstractTexture::subImage<3>(level, range, image);
} }
@ -667,7 +667,7 @@ class MAGNUM_GL_EXPORT CubeMapTextureArray: public AbstractTexture {
* expecting it's not @cpp nullptr @ce, its format is the same as * expecting it's not @cpp nullptr @ce, its format is the same as
* texture format and its size is the same as @p range size. * texture format and its size is the same as @p range size.
*/ */
void compressedSubImage(Int level, const Range3Di& range, MutableCompressedImageView3D& image) { void compressedSubImage(Int level, const Range3Di& range, const MutableCompressedImageView3D& image) {
AbstractTexture::compressedSubImage<3>(level, range, image); AbstractTexture::compressedSubImage<3>(level, range, image);
} }

8
src/Magnum/GL/RectangleTexture.h
Unescape View File

@ -376,7 +376,7 @@ class MAGNUM_GL_EXPORT RectangleTexture: public AbstractTexture {
* the memory provided by @p image, expecting it's not @cpp nullptr @ce * the memory provided by @p image, expecting it's not @cpp nullptr @ce
* and its size is the same as texture size. * and its size is the same as texture size.
*/ */
void image(MutableImageView2D& image) { void image(const MutableImageView2D& image) {
AbstractTexture::image<2>(0, image); AbstractTexture::image<2>(0, image);
} }
@ -426,7 +426,7 @@ class MAGNUM_GL_EXPORT RectangleTexture: public AbstractTexture {
* it's not @cpp nullptr @ce, its format is the same as texture format * it's not @cpp nullptr @ce, its format is the same as texture format
* and its size is the same as texture size. * and its size is the same as texture size.
*/ */
void compressedImage(MutableCompressedImageView2D& image) { void compressedImage(const MutableCompressedImageView2D& image) {
AbstractTexture::compressedImage<2>(0, image); AbstractTexture::compressedImage<2>(0, image);
} }
@ -476,7 +476,7 @@ class MAGNUM_GL_EXPORT RectangleTexture: public AbstractTexture {
* reads the pixels into the memory provided by @p image, expecting * reads the pixels into the memory provided by @p image, expecting
* it's not @cpp nullptr @ce and its size is the same as @p range size. * it's not @cpp nullptr @ce and its size is the same as @p range size.
*/ */
void subImage(const Range2Di& range, MutableImageView2D& image) { void subImage(const Range2Di& range, const MutableImageView2D& image) {
AbstractTexture::subImage<2>(0, range, image); AbstractTexture::subImage<2>(0, range, image);
} }
@ -532,7 +532,7 @@ class MAGNUM_GL_EXPORT RectangleTexture: public AbstractTexture {
* expecting it's not @cpp nullptr @ce, its format is the same as * expecting it's not @cpp nullptr @ce, its format is the same as
* texture format and its size is the same as @p range size. * texture format and its size is the same as @p range size.
*/ */
void compressedSubImage(const Range2Di& range, MutableCompressedImageView2D& image) { void compressedSubImage(const Range2Di& range, const MutableCompressedImageView2D& image) {
AbstractTexture::compressedSubImage<2>(0, range, image); AbstractTexture::compressedSubImage<2>(0, range, image);
} }

8
src/Magnum/GL/Texture.h
Unescape View File

@ -794,7 +794,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
* the pixels into the memory provided by @p image, expecting it's not * the pixels into the memory provided by @p image, expecting it's not
* @cpp nullptr @ce and its size is the same as size of given @p level. * @cpp nullptr @ce and its size is the same as size of given @p level.
*/ */
void image(Int level, BasicMutableImageView<dimensions>& image) { void image(Int level, const BasicMutableImageView<dimensions>& image) {
AbstractTexture::image<dimensions>(level, image); AbstractTexture::image<dimensions>(level, image);
} }
@ -877,7 +877,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
* expecting it's not @cpp nullptr @ce, its format is the same as * expecting it's not @cpp nullptr @ce, its format is the same as
* texture format and its size is the same as size of given @p level. * texture format and its size is the same as size of given @p level.
*/ */
void compressedImage(Int level, BasicMutableCompressedImageView<dimensions>& image) { void compressedImage(Int level, const BasicMutableCompressedImageView<dimensions>& image) {
AbstractTexture::compressedImage<dimensions>(level, image); AbstractTexture::compressedImage<dimensions>(level, image);
} }
@ -949,7 +949,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
* expecting it's not @cpp nullptr @ce and its size is the same as * expecting it's not @cpp nullptr @ce and its size is the same as
* @p range size. * @p range size.
*/ */
void subImage(Int level, const RangeTypeFor<dimensions, Int>& range, BasicMutableImageView<dimensions>& image) { void subImage(Int level, const RangeTypeFor<dimensions, Int>& range, const BasicMutableImageView<dimensions>& image) {
AbstractTexture::subImage<dimensions>(level, range, image); AbstractTexture::subImage<dimensions>(level, range, image);
} }
@ -1030,7 +1030,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
* expecting it's not @cpp nullptr @ce, its format is the same as * expecting it's not @cpp nullptr @ce, its format is the same as
* texture format and its size is the same as @p range size. * texture format and its size is the same as @p range size.
*/ */
void compressedSubImage(Int level, const RangeTypeFor<dimensions, Int>& range, BasicMutableCompressedImageView<dimensions>& image) { void compressedSubImage(Int level, const RangeTypeFor<dimensions, Int>& range, const BasicMutableCompressedImageView<dimensions>& image) {
AbstractTexture::compressedSubImage<dimensions>(level, range, image); AbstractTexture::compressedSubImage<dimensions>(level, range, image);
} }

8
src/Magnum/GL/TextureArray.h
Unescape View File

@ -529,7 +529,7 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
* the pixels into the memory provided by @p image, expecting it's not * the pixels into the memory provided by @p image, expecting it's not
* @cpp nullptr @ce and its size is the same as size of given @p level. * @cpp nullptr @ce and its size is the same as size of given @p level.
*/ */
void image(Int level, BasicMutableImageView<dimensions+1>& image) { void image(Int level, const BasicMutableImageView<dimensions+1>& image) {
AbstractTexture::image<dimensions+1>(level, image); AbstractTexture::image<dimensions+1>(level, image);
} }
@ -585,7 +585,7 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
* expecting it's not @cpp nullptr @ce, its format is the same as * expecting it's not @cpp nullptr @ce, its format is the same as
* texture format and its size is the same as size of given @p level. * texture format and its size is the same as size of given @p level.
*/ */
void compressedImage(Int level, BasicMutableCompressedImageView<dimensions+1>& image) { void compressedImage(Int level, const BasicMutableCompressedImageView<dimensions+1>& image) {
AbstractTexture::compressedImage<dimensions+1>(level, image); AbstractTexture::compressedImage<dimensions+1>(level, image);
} }
@ -642,7 +642,7 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
* expecting it's not @cpp nullptr @ce and its size is the same as * expecting it's not @cpp nullptr @ce and its size is the same as
* @p range size. * @p range size.
*/ */
void subImage(Int level, const RangeTypeFor<dimensions+1, Int>& range, BasicMutableImageView<dimensions+1>& image) { void subImage(Int level, const RangeTypeFor<dimensions+1, Int>& range, const BasicMutableImageView<dimensions+1>& image) {
AbstractTexture::subImage<dimensions+1>(level, range, image); AbstractTexture::subImage<dimensions+1>(level, range, image);
} }
@ -704,7 +704,7 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
* expecting it's not @cpp nullptr @ce, its format is the same as * expecting it's not @cpp nullptr @ce, its format is the same as
* texture format and its size is the same as @p range size. * texture format and its size is the same as @p range size.
*/ */
void compressedSubImage(Int level, const RangeTypeFor<dimensions+1, Int>& range, BasicMutableCompressedImageView<dimensions+1>& image) { void compressedSubImage(Int level, const RangeTypeFor<dimensions+1, Int>& range, const BasicMutableCompressedImageView<dimensions+1>& image) {
AbstractTexture::compressedSubImage<dimensions+1>(level, range, image); AbstractTexture::compressedSubImage<dimensions+1>(level, range, image);
} }

Write Preview
Loading…
Cancel
Save