From 4a9b0b36ec1e39175a6e4088f3be0dcf007cb74a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 18 May 2013 20:29:45 +0200 Subject: [PATCH] Refactored AbstractTexture internals. Naming implementation functions similarly to GL function they are wrapping, naming internal API functions similarly to public API. --- src/AbstractTexture.cpp | 16 +++++++------- src/AbstractTexture.h | 46 +++++++++++++++++++-------------------- src/CubeMapTexture.h | 6 ++--- src/CubeMapTextureArray.h | 8 +++---- src/Texture.h | 6 ++--- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/AbstractTexture.cpp b/src/AbstractTexture.cpp index 319541858..2dee68180 100644 --- a/src/AbstractTexture.cpp +++ b/src/AbstractTexture.cpp @@ -72,8 +72,8 @@ AbstractTexture::SubImage2DImplementation AbstractTexture::subImage2DImplementat AbstractTexture::SubImage3DImplementation AbstractTexture::subImage3DImplementation = &AbstractTexture::subImageImplementationDefault; -AbstractTexture::InvalidateImplementation AbstractTexture::invalidateImplementation = &AbstractTexture::invalidateImplementationNoOp; -AbstractTexture::InvalidateSubImplementation AbstractTexture::invalidateSubImplementation = &AbstractTexture::invalidateSubImplementationNoOp; +AbstractTexture::InvalidateImageImplementation AbstractTexture::invalidateImageImplementation = &AbstractTexture::invalidateImageImplementationNoOp; +AbstractTexture::InvalidateSubImageImplementation AbstractTexture::invalidateSubImageImplementation = &AbstractTexture::invalidateSubImageImplementationNoOp; /* Check correctness of binary OR in setMinificationFilter(). If nobody fucks anything up, this assert should produce the same results on all dimensions, @@ -244,8 +244,8 @@ void AbstractTexture::initializeContextBasedFunctionality(Context* context) { if(context->isExtensionSupported()) { Debug() << "AbstractTexture: using" << Extensions::GL::ARB::invalidate_subdata::string() << "features"; - invalidateImplementation = &AbstractTexture::invalidateImplementationARB; - invalidateSubImplementation = &AbstractTexture::invalidateSubImplementationARB; + invalidateImageImplementation = &AbstractTexture::invalidateImageImplementationARB; + invalidateSubImageImplementation = &AbstractTexture::invalidateSubImageImplementationARB; } #endif } @@ -440,18 +440,18 @@ void AbstractTexture::subImageImplementationDSA(GLenum target, GLint level, cons } #endif -void AbstractTexture::invalidateImplementationNoOp(GLint) {} +void AbstractTexture::invalidateImageImplementationNoOp(GLint) {} #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::invalidateImplementationARB(GLint level) { +void AbstractTexture::invalidateImageImplementationARB(GLint level) { glInvalidateTexImage(_id, level); } #endif -void AbstractTexture::invalidateSubImplementationNoOp(GLint, const Vector3i&, const Vector3i&) {} +void AbstractTexture::invalidateSubImageImplementationNoOp(GLint, const Vector3i&, const Vector3i&) {} #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::invalidateSubImplementationARB(GLint level, const Vector3i& offset, const Vector3i& size) { +void AbstractTexture::invalidateSubImageImplementationARB(GLint level, const Vector3i& offset, const Vector3i& size) { glInvalidateTexSubImage(_id, level, offset.x(), offset.y(), offset.z(), size.x(), size.y(), size.z()); } #endif diff --git a/src/AbstractTexture.h b/src/AbstractTexture.h index 2ebdba862..468538fc7 100644 --- a/src/AbstractTexture.h +++ b/src/AbstractTexture.h @@ -1141,7 +1141,7 @@ class MAGNUM_EXPORT AbstractTexture { * @fn_gl{InvalidateTexImage} */ inline void invalidateImage(Int level) { - (this->*invalidateImplementation)(level); + (this->*invalidateImageImplementation)(level); } /** @@ -1278,19 +1278,19 @@ class MAGNUM_EXPORT AbstractTexture { #endif static SubImage3DImplementation subImage3DImplementation; - typedef void(AbstractTexture::*InvalidateImplementation)(GLint); - void MAGNUM_LOCAL invalidateImplementationNoOp(GLint level); + typedef void(AbstractTexture::*InvalidateImageImplementation)(GLint); + void MAGNUM_LOCAL invalidateImageImplementationNoOp(GLint level); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL invalidateImplementationARB(GLint level); + void MAGNUM_LOCAL invalidateImageImplementationARB(GLint level); #endif - static InvalidateImplementation invalidateImplementation; + static InvalidateImageImplementation invalidateImageImplementation; - typedef void(AbstractTexture::*InvalidateSubImplementation)(GLint, const Vector3i&, const Vector3i&); - void MAGNUM_LOCAL invalidateSubImplementationNoOp(GLint level, const Vector3i& offset, const Vector3i& size); + typedef void(AbstractTexture::*InvalidateSubImageImplementation)(GLint, const Vector3i&, const Vector3i&); + void MAGNUM_LOCAL invalidateSubImageImplementationNoOp(GLint level, const Vector3i& offset, const Vector3i& size); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL invalidateSubImplementationARB(GLint level, const Vector3i& offset, const Vector3i& size); + void MAGNUM_LOCAL invalidateSubImageImplementationARB(GLint level, const Vector3i& offset, const Vector3i& size); #endif - static InvalidateSubImplementation invalidateSubImplementation; + static InvalidateSubImageImplementation invalidateSubImageImplementation; void MAGNUM_LOCAL destroy(); void MAGNUM_LOCAL move(); @@ -1334,16 +1334,16 @@ template<> struct AbstractTexture::DataHelper<1> { (texture->*storage1DImplementation)(target, levels, internalFormat, size); } - template inline static typename std::enable_if::type set(AbstractTexture* texture, GLenum target, GLint level, InternalFormat internalFormat, Image* image) { + template inline static typename std::enable_if::type setImage(AbstractTexture* texture, GLenum target, GLint level, InternalFormat internalFormat, Image* image) { (texture->*image1DImplementation)(target, level, internalFormat, image->size(), image->format(), image->type(), Implementation::ImageHelper::dataOrPixelUnpackBuffer(image)); } - template inline static typename std::enable_if::type setSub(AbstractTexture* texture, GLenum target, GLint level, const Math::Vector<1, GLint>& offset, Image* image) { + template inline static typename std::enable_if::type setSubImage(AbstractTexture* texture, GLenum target, GLint level, const Math::Vector<1, GLint>& offset, Image* image) { (texture->*subImage1DImplementation)(target, level, offset, image->size(), image->format(), image->type(), Implementation::ImageHelper::dataOrPixelUnpackBuffer(image)); } - inline static void invalidateSub(AbstractTexture* texture, GLint level, const Math::Vector<1, GLint>& offset, const Math::Vector<1, GLint>& size) { - (texture->*invalidateSubImplementation)(level, {offset[0], 0, 0}, {size[0], 1, 1}); + inline static void invalidateSubImage(AbstractTexture* texture, GLint level, const Math::Vector<1, GLint>& offset, const Math::Vector<1, GLint>& size) { + (texture->*invalidateSubImageImplementation)(level, {offset[0], 0, 0}, {size[0], 1, 1}); } }; #endif @@ -1369,20 +1369,20 @@ template<> struct MAGNUM_EXPORT AbstractTexture::DataHelper<2> { (texture->*storage2DImplementation)(target, levels, internalFormat, size); } - template inline static typename std::enable_if::type set(AbstractTexture* texture, GLenum target, GLint level, InternalFormat internalFormat, Image* image) { + template inline static typename std::enable_if::type setImage(AbstractTexture* texture, GLenum target, GLint level, InternalFormat internalFormat, Image* image) { (texture->*image2DImplementation)(target, level, internalFormat, image->size(), image->format(), image->type(), Implementation::ImageHelper::dataOrPixelUnpackBuffer(image)); } - template inline static typename std::enable_if::type setSub(AbstractTexture* texture, GLenum target, GLint level, const Vector2i& offset, Image* image) { + template inline static typename std::enable_if::type setSubImage(AbstractTexture* texture, GLenum target, GLint level, const Vector2i& offset, Image* image) { (texture->*subImage2DImplementation)(target, level, offset, image->size(), image->format(), image->type(), Implementation::ImageHelper::dataOrPixelUnpackBuffer(image)); } - template inline static typename std::enable_if::type setSub(AbstractTexture* texture, GLenum target, GLint level, const Vector2i& offset, Image* image) { + template inline static typename std::enable_if::type setSubImage(AbstractTexture* texture, GLenum target, GLint level, const Vector2i& offset, Image* image) { (texture->*subImage2DImplementation)(target, level, offset, Vector2i(image->size(), 1), image->format(), image->type(), Implementation::ImageHelper::dataOrPixelUnpackBuffer(image)); } - inline static void invalidateSub(AbstractTexture* texture, GLint level, const Vector2i& offset, const Vector2i& size) { - (texture->*invalidateSubImplementation)(level, {offset, 0}, {size, 1}); + inline static void invalidateSubImage(AbstractTexture* texture, GLint level, const Vector2i& offset, const Vector2i& size) { + (texture->*invalidateSubImageImplementation)(level, {offset, 0}, {size, 1}); } }; template<> struct MAGNUM_EXPORT AbstractTexture::DataHelper<3> { @@ -1407,20 +1407,20 @@ template<> struct MAGNUM_EXPORT AbstractTexture::DataHelper<3> { (texture->*storage3DImplementation)(target, levels, internalFormat, size); } - template inline static typename std::enable_if::type set(AbstractTexture* texture, GLenum target, GLint level, InternalFormat internalFormat, Image* image) { + template inline static typename std::enable_if::type setImage(AbstractTexture* texture, GLenum target, GLint level, InternalFormat internalFormat, Image* image) { (texture->*image3DImplementation)(target, level, internalFormat, image->size(), image->format(), image->type(), Implementation::ImageHelper::dataOrPixelUnpackBuffer(image)); } - template inline static typename std::enable_if::type setSub(AbstractTexture* texture, GLenum target, GLint level, const Vector3i& offset, Image* image) { + template inline static typename std::enable_if::type setSubImage(AbstractTexture* texture, GLenum target, GLint level, const Vector3i& offset, Image* image) { (texture->*subImage3DImplementation)(target, level, offset, image->size(), image->format(), image->type(), Implementation::ImageHelper::dataOrPixelUnpackBuffer(image)); } - template inline static typename std::enable_if::type setSub(AbstractTexture* texture, GLenum target, GLint level, const Vector3i& offset, Image* image) { + template inline static typename std::enable_if::type setSubImage(AbstractTexture* texture, GLenum target, GLint level, const Vector3i& offset, Image* image) { (texture->*subImage3DImplementation)(target, level, offset, Vector3i(image->size(), 1), image->format(), image->type(), Implementation::ImageHelper::dataOrPixelUnpackBuffer(image)); } - inline static void invalidateSub(AbstractTexture* texture, GLint level, const Vector3i& offset, const Vector3i& size) { - (texture->*invalidateSubImplementation)(level, offset, size); + inline static void invalidateSubImage(AbstractTexture* texture, GLint level, const Vector3i& offset, const Vector3i& size) { + (texture->*invalidateSubImageImplementation)(level, offset, size); } }; #endif diff --git a/src/CubeMapTexture.h b/src/CubeMapTexture.h index 1b17e38bb..979ececb9 100644 --- a/src/CubeMapTexture.h +++ b/src/CubeMapTexture.h @@ -141,7 +141,7 @@ class CubeMapTexture: public AbstractTexture { * See Texture::setImage() for more information. */ template inline CubeMapTexture* setImage(Coordinate coordinate, Int level, InternalFormat internalFormat, Image* image) { - DataHelper<2>::set(this, static_cast(coordinate), level, internalFormat, image); + DataHelper<2>::setImage(this, static_cast(coordinate), level, internalFormat, image); return this; } @@ -157,7 +157,7 @@ class CubeMapTexture: public AbstractTexture { * See Texture::setSubImage() for more information. */ template inline CubeMapTexture* setSubImage(Coordinate coordinate, Int level, const Vector2i& offset, const Image* image) { - DataHelper<2>::setSub(this, static_cast(coordinate), level, offset, image); + DataHelper<2>::setSubImage(this, static_cast(coordinate), level, offset, image); return this; } @@ -174,7 +174,7 @@ class CubeMapTexture: public AbstractTexture { * See Texture::invalidateSubImage() for more information. */ inline void invalidateSubImage(Int level, const Vector3i& offset, const Vector3i& size) { - DataHelper<3>::invalidateSub(this, level, offset, size); + DataHelper<3>::invalidateSubImage(this, level, offset, size); } /* Overloads to remove WTF-factor from method chaining order */ diff --git a/src/CubeMapTextureArray.h b/src/CubeMapTextureArray.h index 2c8577f90..8c439a672 100644 --- a/src/CubeMapTextureArray.h +++ b/src/CubeMapTextureArray.h @@ -144,7 +144,7 @@ class CubeMapTextureArray: public AbstractTexture { * See Texture::setImage() for more information. */ template inline CubeMapTextureArray* setImage(Int level, InternalFormat internalFormat, T* image) { - DataHelper<3>::set(this, GL_TEXTURE_CUBE_MAP_ARRAY, level, internalFormat, image); + DataHelper<3>::setImage(this, GL_TEXTURE_CUBE_MAP_ARRAY, level, internalFormat, image); return this; } @@ -168,7 +168,7 @@ class CubeMapTextureArray: public AbstractTexture { * @see setSubImage(Int, Coordinate, Int, const Math::Vector<2, Int>&, const Image*) */ template inline CubeMapTextureArray* setSubImage(Int level, const Vector3i& offset, const Image* image) { - DataHelper<3>::setSub(this, GL_TEXTURE_CUBE_MAP_ARRAY, level, offset, image, Vector3i(Math::Vector())); + DataHelper<3>::setSubImage(this, GL_TEXTURE_CUBE_MAP_ARRAY, level, offset, image, Vector3i(Math::Vector())); return this; } @@ -187,7 +187,7 @@ class CubeMapTextureArray: public AbstractTexture { * @see setSubImage(Int, const Math::Vector<3, Int>&, const Image*) */ template inline CubeMapTextureArray* setSubImage(Int layer, Coordinate coordinate, Int level, const Vector2i& offset, const Image* image) { - DataHelper<3>::setSub(this, GL_TEXTURE_CUBE_MAP_ARRAY, level, Vector3i(offset, layer*6+static_cast(coordinate)), image, Vector2i(Math::Vector())); + DataHelper<3>::setSubImage(this, GL_TEXTURE_CUBE_MAP_ARRAY, level, Vector3i(offset, layer*6+static_cast(coordinate)), image, Vector2i(Math::Vector())); return this; } @@ -204,7 +204,7 @@ class CubeMapTextureArray: public AbstractTexture { * See Texture::invalidateSubImage() for more information. */ inline void invalidateSubImage(Int level, const Vector3i& offset, const Vector3i& size) { - DataHelper<3>::invalidateSub(this, level, offset, size); + DataHelper<3>::invalidateSubImage(this, level, offset, size); } /* Overloads to remove WTF-factor from method chaining order */ diff --git a/src/Texture.h b/src/Texture.h index 9ab67c85b..7530e0637 100644 --- a/src/Texture.h +++ b/src/Texture.h @@ -273,7 +273,7 @@ template class Texture: public AbstractTexture { * @fn_gl_extension{TextureImage3D,EXT,direct_state_access} */ template inline Texture* setImage(Int level, InternalFormat internalFormat, Image* image) { - DataHelper::set(this, _target, level, internalFormat, image); + DataHelper::setImage(this, _target, level, internalFormat, image); return this; } @@ -303,7 +303,7 @@ template class Texture: public AbstractTexture { * @fn_gl_extension{TextureSubImage3D,EXT,direct_state_access} */ template inline Texture* setSubImage(Int level, const typename DimensionTraits::VectorType& offset, Image* image) { - DataHelper::setSub(this, _target, level, offset, image); + DataHelper::setSubImage(this, _target, level, offset, image); return this; } @@ -318,7 +318,7 @@ template class Texture: public AbstractTexture { * @see invalidateImage(), @fn_gl{InvalidateTexSubImage} */ inline void invalidateSubImage(Int level, const typename DimensionTraits::VectorType& offset, const typename DimensionTraits::VectorType& size) { - DataHelper::invalidateSub(this, level, offset, size); + DataHelper::invalidateSubImage(this, level, offset, size); } /* Overloads to remove WTF-factor from method chaining order */