From ca38c015f00eae2e297ee38019580a36e788090d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 24 May 2013 12:01:58 +0200 Subject: [PATCH] Refactored Buffer internals to follow GL naming conventions. Similar reasoning as in 4a9b0b36ec1e39175a6e4088f3be0dcf007cb74a. --- src/Buffer.cpp | 16 ++++++++-------- src/Buffer.h | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index fc9eab000..eeb26b659 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -36,8 +36,8 @@ namespace Magnum { #ifndef MAGNUM_TARGET_GLES2 Buffer::CopyImplementation Buffer::copyImplementation = &Buffer::copyImplementationDefault; #endif -Buffer::SetDataImplementation Buffer::setDataImplementation = &Buffer::setDataImplementationDefault; -Buffer::SetSubDataImplementation Buffer::setSubDataImplementation = &Buffer::setSubDataImplementationDefault; +Buffer::DataImplementation Buffer::dataImplementation = &Buffer::dataImplementationDefault; +Buffer::SubDataImplementation Buffer::subDataImplementation = &Buffer::subDataImplementationDefault; Buffer::InvalidateImplementation Buffer::invalidateImplementation = &Buffer::invalidateImplementationNoOp; Buffer::InvalidateSubImplementation Buffer::invalidateSubImplementation = &Buffer::invalidateSubImplementationNoOp; #ifndef MAGNUM_TARGET_GLES3 @@ -53,8 +53,8 @@ void Buffer::initializeContextBasedFunctionality(Context* context) { Debug() << "Buffer: using" << Extensions::GL::EXT::direct_state_access::string() << "features"; copyImplementation = &Buffer::copyImplementationDSA; - setDataImplementation = &Buffer::setDataImplementationDSA; - setSubDataImplementation = &Buffer::setSubDataImplementationDSA; + dataImplementation = &Buffer::dataImplementationDSA; + subDataImplementation = &Buffer::subDataImplementationDSA; mapImplementation = &Buffer::mapImplementationDSA; mapRangeImplementation = &Buffer::mapRangeImplementationDSA; flushMappedRangeImplementation = &Buffer::flushMappedRangeImplementationDSA; @@ -123,22 +123,22 @@ void Buffer::copyImplementationDSA(Buffer* read, Buffer* write, GLintptr readOff #endif #endif -void Buffer::setDataImplementationDefault(GLsizeiptr size, const GLvoid* data, Buffer::Usage usage) { +void Buffer::dataImplementationDefault(GLsizeiptr size, const GLvoid* data, Buffer::Usage usage) { glBufferData(static_cast(bindInternal(_targetHint)), size, data, static_cast(usage)); } #ifndef MAGNUM_TARGET_GLES -void Buffer::setDataImplementationDSA(GLsizeiptr size, const GLvoid* data, Buffer::Usage usage) { +void Buffer::dataImplementationDSA(GLsizeiptr size, const GLvoid* data, Buffer::Usage usage) { glNamedBufferDataEXT(_id, size, data, static_cast(usage)); } #endif -void Buffer::setSubDataImplementationDefault(GLintptr offset, GLsizeiptr size, const GLvoid* data) { +void Buffer::subDataImplementationDefault(GLintptr offset, GLsizeiptr size, const GLvoid* data) { glBufferSubData(static_cast(bindInternal(_targetHint)), offset, size, data); } #ifndef MAGNUM_TARGET_GLES -void Buffer::setSubDataImplementationDSA(GLintptr offset, GLsizeiptr size, const GLvoid* data) { +void Buffer::subDataImplementationDSA(GLintptr offset, GLsizeiptr size, const GLvoid* data) { glNamedBufferSubDataEXT(_id, offset, size, data); } #endif diff --git a/src/Buffer.h b/src/Buffer.h index 4c29b8366..bb7c5341e 100644 --- a/src/Buffer.h +++ b/src/Buffer.h @@ -533,7 +533,7 @@ class MAGNUM_EXPORT Buffer { * @fn_gl_extension{NamedBufferData,EXT,direct_state_access} */ inline Buffer* setData(GLsizeiptr size, const GLvoid* data, Usage usage) { - (this->*setDataImplementation)(size, data, usage); + (this->*dataImplementation)(size, data, usage); return this; } @@ -582,7 +582,7 @@ class MAGNUM_EXPORT Buffer { * or @fn_gl_extension{NamedBufferSubData,EXT,direct_state_access} */ inline Buffer* setSubData(GLintptr offset, GLsizeiptr size, const GLvoid* data) { - (this->*setSubDataImplementation)(offset, size, data); + (this->*subDataImplementation)(offset, size, data); return this; } @@ -746,19 +746,19 @@ class MAGNUM_EXPORT Buffer { static CopyImplementation copyImplementation; #endif - typedef void(Buffer::*SetDataImplementation)(GLsizeiptr, const GLvoid*, Usage); - void MAGNUM_LOCAL setDataImplementationDefault(GLsizeiptr size, const GLvoid* data, Usage usage); + typedef void(Buffer::*DataImplementation)(GLsizeiptr, const GLvoid*, Usage); + void MAGNUM_LOCAL dataImplementationDefault(GLsizeiptr size, const GLvoid* data, Usage usage); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL setDataImplementationDSA(GLsizeiptr size, const GLvoid* data, Usage usage); + void MAGNUM_LOCAL dataImplementationDSA(GLsizeiptr size, const GLvoid* data, Usage usage); #endif - static SetDataImplementation setDataImplementation; + static DataImplementation dataImplementation; - typedef void(Buffer::*SetSubDataImplementation)(GLintptr, GLsizeiptr, const GLvoid*); - void MAGNUM_LOCAL setSubDataImplementationDefault(GLintptr offset, GLsizeiptr size, const GLvoid* data); + typedef void(Buffer::*SubDataImplementation)(GLintptr, GLsizeiptr, const GLvoid*); + void MAGNUM_LOCAL subDataImplementationDefault(GLintptr offset, GLsizeiptr size, const GLvoid* data); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL setSubDataImplementationDSA(GLintptr offset, GLsizeiptr size, const GLvoid* data); + void MAGNUM_LOCAL subDataImplementationDSA(GLintptr offset, GLsizeiptr size, const GLvoid* data); #endif - static SetSubDataImplementation setSubDataImplementation; + static SubDataImplementation subDataImplementation; typedef void(Buffer::*InvalidateImplementation)(); void MAGNUM_LOCAL invalidateImplementationNoOp();