diff options
| -rw-r--r-- | gfx/gl/glBuffer.h | 3 | ||||
| -rw-r--r-- | gfx/gl/glVertexArray.h | 9 | ||||
| -rw-r--r-- | lib/glArrays.h | 13 |
3 files changed, 5 insertions, 20 deletions
diff --git a/gfx/gl/glBuffer.h b/gfx/gl/glBuffer.h index f43c223..275276f 100644 --- a/gfx/gl/glBuffer.h +++ b/gfx/gl/glBuffer.h @@ -3,7 +3,6 @@ #include "glArrays.h" namespace Impl { - // NOLINTNEXTLINE(readability-identifier-naming) struct glBuffer : Detail::glNamed { void storage(const std::ranges::contiguous_range auto & data, GLenum flags) @@ -21,7 +20,5 @@ namespace Impl { }; } -// NOLINTBEGIN(readability-identifier-naming) template<size_t N> using glBuffers = glManagedArray<Impl::glBuffer, N, &glCreateBuffers, &glDeleteBuffers>; using glBuffer = glManagedSingle<Impl::glBuffer, &glCreateBuffers, &glDeleteBuffers>; -// NOLINTEND(readability-identifier-naming) diff --git a/gfx/gl/glVertexArray.h b/gfx/gl/glVertexArray.h index 3790863..dbe930f 100644 --- a/gfx/gl/glVertexArray.h +++ b/gfx/gl/glVertexArray.h @@ -108,7 +108,6 @@ namespace Impl { GLuint attrib = 0; }; - // NOLINTNEXTLINE(readability-identifier-naming) struct glVertexArray : Detail::glNamed { VertexArrayConfigurator configure() @@ -116,21 +115,19 @@ namespace Impl { return VertexArrayConfigurator {name}; } - template<typename GlAllocated> + template<typename glAllocated> void - useBuffer(GLuint binding, const GlAllocated & buffer) const + useBuffer(GLuint binding, const glAllocated & buffer) const requires requires { { buffer.bufferName() } -> std::same_as<GLuint>; } { - using T = typename GlAllocated::value_type; + using T = typename glAllocated::value_type; glVertexArrayVertexBuffer(name, binding, buffer.bufferName(), 0, sizeof(T)); } }; } -// NOLINTBEGIN(readability-identifier-naming) template<size_t N> using glVertexArrays = glManagedArray<Impl::glVertexArray, N, &glCreateVertexArrays, &glDeleteVertexArrays>; using glVertexArray = glManagedSingle<Impl::glVertexArray, &glCreateVertexArrays, &glDeleteVertexArrays>; -// NOLINTEND(readability-identifier-naming) diff --git a/lib/glArrays.h b/lib/glArrays.h index 1cf2fbf..93ea992 100644 --- a/lib/glArrays.h +++ b/lib/glArrays.h @@ -8,19 +8,15 @@ #include <utility> namespace Detail { - // NOLINTNEXTLINE(readability-identifier-naming) class glNamed; template<typename Named> concept IsglNamed = sizeof(Named) == sizeof(GLuint) && std::is_base_of_v<Detail::glNamed, Named>; } -template<Detail::IsglNamed, size_t, auto, auto> -// NOLINTNEXTLINE(readability-identifier-naming) -struct glManagedArray; +template<Detail::IsglNamed, size_t, auto, auto> struct glManagedArray; namespace Detail { - // NOLINTNEXTLINE(readability-identifier-naming) class glNamed { public: glNamed() = default; @@ -45,7 +41,6 @@ namespace Detail { }; } -// NOLINTNEXTLINE(readability-identifier-naming) template<Detail::IsglNamed Named, auto Gen, auto Del> struct glManagedSingle : public Named { glManagedSingle() noexcept { @@ -77,9 +72,7 @@ template<Detail::IsglNamed Named, auto Gen, auto Del> struct glManagedSingle : p } }; -template<Detail::IsglNamed Named, size_t N, auto Gen, auto Del> -// NOLINTNEXTLINE(readability-identifier-naming) -struct glManagedArray : public std::array<Named, N> { +template<Detail::IsglNamed Named, size_t N, auto Gen, auto Del> struct glManagedArray : public std::array<Named, N> { using Arr = std::array<Named, N>; glManagedArray() noexcept @@ -118,10 +111,8 @@ struct glManagedArray : public std::array<Named, N> { } }; -// NOLINTBEGIN(readability-identifier-naming) template<size_t N> using glFrameBuffers = glManagedArray<Detail::glNamed, N, &glGenFramebuffers, &glDeleteFramebuffers>; using glFrameBuffer = glManagedSingle<Detail::glNamed, &glGenFramebuffers, &glDeleteFramebuffers>; template<size_t N> using glRenderBuffers = glManagedArray<Detail::glNamed, N, &glGenRenderbuffers, &glDeleteRenderbuffers>; using glRenderBuffer = glManagedSingle<Detail::glNamed, &glGenRenderbuffers, &glDeleteRenderbuffers>; -// NOLINTEND(readability-identifier-naming) |