From c7a76a45fa11686bc0e81e7d45c81192fa97c236 Mon Sep 17 00:00:00 2001 From: Hugo Amiard Date: Thu, 15 Sep 2022 18:08:02 +0200 Subject: [PATCH] GL: Remove deprecated std::tuple functions in Buffer/TransformFeedback --- doc/snippets/MagnumGL.cpp | 5 ++--- src/Magnum/GL/Buffer.cpp | 14 -------------- src/Magnum/GL/Buffer.h | 10 ---------- src/Magnum/GL/Test/BufferGLTest.cpp | 5 ++--- src/Magnum/GL/Test/TransformFeedbackGLTest.cpp | 5 ++--- src/Magnum/GL/TransformFeedback.cpp | 14 -------------- src/Magnum/GL/TransformFeedback.h | 10 ---------- 7 files changed, 6 insertions(+), 57 deletions(-) diff --git a/doc/snippets/MagnumGL.cpp b/doc/snippets/MagnumGL.cpp index e64b01a1d..0ae3196ab 100644 --- a/doc/snippets/MagnumGL.cpp +++ b/doc/snippets/MagnumGL.cpp @@ -196,10 +196,9 @@ MyShader& setTransformFeedback(GL::TransformFeedback& feedback, Int totalCount, GL::Buffer& positions, GLintptr positionsOffset, GL::Buffer& data, GLintptr dataOffset) { - using BufferOffset = Containers::Triple; feedback.attachBuffers(0, { - BufferOffset{&positions, positionsOffset, (GLsizeiptr)totalCount*sizeof(Vector3)}, - BufferOffset{&data, dataOffset, (GLsizeiptr)totalCount*sizeof(Vector2ui)} + {&positions, positionsOffset, GLsizeiptr(totalCount*sizeof(Vector3))}, + {&data, dataOffset, GLsizeiptr(totalCount*sizeof(Vector2ui))} }); return *this; } diff --git a/src/Magnum/GL/Buffer.cpp b/src/Magnum/GL/Buffer.cpp index 22c9db1ee..4d26d3c9c 100644 --- a/src/Magnum/GL/Buffer.cpp +++ b/src/Magnum/GL/Buffer.cpp @@ -26,9 +26,6 @@ #include "Buffer.h" -#ifdef MAGNUM_BUILD_DEPRECATED -#include -#endif #include #include #ifndef MAGNUM_TARGET_WEBGL @@ -162,17 +159,6 @@ void Buffer::bind(const Target target, const UnsignedInt firstIndex, std::initia Context::current().state().buffer.bindRangesImplementation(target, firstIndex, {buffers.begin(), buffers.size()}); } -#ifdef MAGNUM_BUILD_DEPRECATED -void Buffer::bind(const Target target, const UnsignedInt firstIndex, std::initializer_list> buffers) { - Containers::Array> copy{NoInit, buffers.size()}; - for(std::size_t i = 0, max = buffers.size(); i != max; ++i) { - const auto& t = *(buffers.begin() + i); - copy[i] = {std::get<0>(t), std::get<1>(t), std::get<2>(t)}; - } - bind(target, firstIndex, copy); -} -#endif - void Buffer::bind(const Target target, const UnsignedInt firstIndex, Containers::ArrayView buffers) { Context::current().state().buffer.bindBasesImplementation(target, firstIndex, {buffers.begin(), buffers.size()}); } diff --git a/src/Magnum/GL/Buffer.h b/src/Magnum/GL/Buffer.h index bc127792e..cdec63478 100644 --- a/src/Magnum/GL/Buffer.h +++ b/src/Magnum/GL/Buffer.h @@ -44,8 +44,6 @@ /* For label() / setLabel(), which used to be a std::string. Not ideal for the return type, but at least something. */ #include -/* For deprecated bind(..., std::initializer_list) */ -#include #endif namespace Magnum { namespace GL { @@ -773,14 +771,6 @@ class MAGNUM_GL_EXPORT Buffer: public AbstractObject { /** @overload */ static void bind(Target target, UnsignedInt firstIndex, std::initializer_list> buffers); - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @m_deprecated_since_latest Use @ref bind(Target, UnsignedInt, std::initializer_list>) - * instead. - */ - static CORRADE_DEPRECATED("use the Containers::Triple overload instead") void bind(Target target, UnsignedInt firstIndex, std::initializer_list> buffers); - #endif - /** * @brief Bind buffers to given range of indexed targets * diff --git a/src/Magnum/GL/Test/BufferGLTest.cpp b/src/Magnum/GL/Test/BufferGLTest.cpp index 0c867f87b..22c04bd16 100644 --- a/src/Magnum/GL/Test/BufferGLTest.cpp +++ b/src/Magnum/GL/Test/BufferGLTest.cpp @@ -254,10 +254,9 @@ void BufferGLTest::bindRange() { MAGNUM_VERIFY_NO_GL_ERROR(); - using BufferOffset = Containers::Triple; Buffer::bind(Buffer::Target::Uniform, 7, { - BufferOffset{&buffer, 256, 13}, {}, - BufferOffset{&buffer, 768, 64}}); + {&buffer, 256, 13}, {}, + {&buffer, 768, 64}}); MAGNUM_VERIFY_NO_GL_ERROR(); } diff --git a/src/Magnum/GL/Test/TransformFeedbackGLTest.cpp b/src/Magnum/GL/Test/TransformFeedbackGLTest.cpp index edce8220b..130da0934 100644 --- a/src/Magnum/GL/Test/TransformFeedbackGLTest.cpp +++ b/src/Magnum/GL/Test/TransformFeedbackGLTest.cpp @@ -489,10 +489,9 @@ void TransformFeedbackGLTest::attachRanges() { .setCount(2); TransformFeedback feedback; - using BufferOffset = Containers::Triple; feedback.attachBuffers(0, { - BufferOffset{&output1, 256, 2*sizeof(Vector2)}, - BufferOffset{&output2, 512, 2*sizeof(Float)} + {&output1, 256, 2*sizeof(Vector2)}, + {&output2, 512, 2*sizeof(Float)} }); MAGNUM_VERIFY_NO_GL_ERROR(); diff --git a/src/Magnum/GL/TransformFeedback.cpp b/src/Magnum/GL/TransformFeedback.cpp index 17edae527..b0479ea64 100644 --- a/src/Magnum/GL/TransformFeedback.cpp +++ b/src/Magnum/GL/TransformFeedback.cpp @@ -26,9 +26,6 @@ #include "TransformFeedback.h" #ifndef MAGNUM_TARGET_GLES2 -#ifdef MAGNUM_BUILD_DEPRECATED -#include -#endif #ifndef MAGNUM_TARGET_WEBGL #include #endif @@ -220,17 +217,6 @@ TransformFeedback& TransformFeedback::attachBuffers(const UnsignedInt firstIndex return *this; } -#ifdef MAGNUM_BUILD_DEPRECATED -TransformFeedback& TransformFeedback::attachBuffers(UnsignedInt firstIndex, std::initializer_list> buffers) { - Containers::Array> copy{NoInit, buffers.size()}; - for(std::size_t i = 0, max = buffers.size(); i != max; ++i) { - const auto& t = *(buffers.begin() + i); - copy[i] = {std::get<0>(t), std::get<1>(t), std::get<2>(t)}; - } - return attachBuffers(firstIndex, copy); -} -#endif - TransformFeedback& TransformFeedback::attachBuffers(const UnsignedInt firstIndex, Containers::ArrayView buffers) { (this->*Context::current().state().transformFeedback.attachBasesImplementation)(firstIndex, buffers); return *this; diff --git a/src/Magnum/GL/TransformFeedback.h b/src/Magnum/GL/TransformFeedback.h index 8acf24596..878d9385c 100644 --- a/src/Magnum/GL/TransformFeedback.h +++ b/src/Magnum/GL/TransformFeedback.h @@ -42,8 +42,6 @@ /* For label() / setLabel(), which used to be a std::string. Not ideal for the return type, but at least something. */ #include -/* For deprecated bind(..., std::initializer_list) */ -#include #endif #ifndef MAGNUM_TARGET_GLES2 @@ -347,14 +345,6 @@ class MAGNUM_GL_EXPORT TransformFeedback: public AbstractObject { /** @overload */ TransformFeedback& attachBuffers(UnsignedInt firstIndex, std::initializer_list> buffers); - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @m_deprecated_since_latest Use @ref attachBuffers(UnsignedInt, std::initializer_list>) - * instead. - */ - CORRADE_DEPRECATED("use the Containers::Triple overload instead") TransformFeedback& attachBuffers(UnsignedInt firstIndex, std::initializer_list> buffers); - #endif - /** * @brief Attach buffers * @return Reference to self (for method chaining)