diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 2fa92c0b2..4c2e18718 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -40,7 +40,9 @@ Buffer::SetDataImplementation Buffer::setDataImplementation = &Buffer::setDataIm Buffer::SetSubDataImplementation Buffer::setSubDataImplementation = &Buffer::setSubDataImplementationDefault; Buffer::InvalidateImplementation Buffer::invalidateImplementation = &Buffer::invalidateImplementationNoOp; Buffer::InvalidateSubImplementation Buffer::invalidateSubImplementation = &Buffer::invalidateSubImplementationNoOp; +#ifndef MAGNUM_TARGET_GLES3 Buffer::MapImplementation Buffer::mapImplementation = &Buffer::mapImplementationDefault; +#endif Buffer::MapRangeImplementation Buffer::mapRangeImplementation = &Buffer::mapRangeImplementationDefault; Buffer::FlushMappedRangeImplementation Buffer::flushMappedRangeImplementation = &Buffer::flushMappedRangeImplementationDefault; Buffer::UnmapImplementation Buffer::unmapImplementation = &Buffer::unmapImplementationDefault; @@ -156,6 +158,7 @@ void Buffer::invalidateSubImplementationARB(GLintptr offset, GLsizeiptr length) } #endif +#ifndef MAGNUM_TARGET_GLES3 void* Buffer::mapImplementationDefault(MapAccess access) { /** @todo Re-enable when extension wrangler is available for ES */ #ifndef MAGNUM_TARGET_GLES @@ -171,6 +174,7 @@ void* Buffer::mapImplementationDSA(MapAccess access) { return glMapNamedBufferEXT(_id, GLenum(access)); } #endif +#endif void* Buffer::mapRangeImplementationDefault(GLintptr offset, GLsizeiptr length, MapFlags access) { /** @todo Re-enable when extension wrangler is available for ES */ diff --git a/src/Buffer.h b/src/Buffer.h index 9d3e0c7e9..63be6124e 100644 --- a/src/Buffer.h +++ b/src/Buffer.h @@ -316,6 +316,7 @@ class MAGNUM_EXPORT Buffer { #endif }; + #ifndef MAGNUM_TARGET_GLES3 /** * @brief Memory mapping access * @@ -352,6 +353,7 @@ class MAGNUM_EXPORT Buffer { ReadWrite = GL_READ_WRITE #endif }; + #endif /** * @brief Memory mapping flag @@ -625,6 +627,7 @@ class MAGNUM_EXPORT Buffer { } #endif + #ifndef MAGNUM_TARGET_GLES3 /** * @brief Map buffer to client memory * @param access Access @@ -644,6 +647,7 @@ class MAGNUM_EXPORT Buffer { inline void* map(MapAccess access) { return (this->*mapImplementation)(access); } + #endif /** * @brief Map buffer to client memory @@ -747,12 +751,14 @@ class MAGNUM_EXPORT Buffer { #endif static InvalidateSubImplementation invalidateSubImplementation; + #ifndef MAGNUM_TARGET_GLES3 typedef void*(Buffer::*MapImplementation)(MapAccess); void MAGNUM_LOCAL * mapImplementationDefault(MapAccess access); #ifndef MAGNUM_TARGET_GLES void MAGNUM_LOCAL * mapImplementationDSA(MapAccess access); #endif static MapImplementation mapImplementation; + #endif typedef void*(Buffer::*MapRangeImplementation)(GLintptr, GLsizeiptr, MapFlags); void MAGNUM_LOCAL * mapRangeImplementationDefault(GLintptr offset, GLsizeiptr length, MapFlags access);