From b0741493f9a50d0e4fa15035e1bb9e568ecc0279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 7 Sep 2014 21:55:35 +0200 Subject: [PATCH] Preparation for ARB_direct_state_access GL 4.5 feature. Renamed all EXT_direct_state_access implementations to reflect the fact that these aren't using the ARB extension. --- src/Magnum/AbstractFramebuffer.cpp | 8 +-- src/Magnum/AbstractFramebuffer.h | 8 +-- src/Magnum/AbstractTexture.cpp | 44 ++++++++-------- src/Magnum/AbstractTexture.h | 44 ++++++++-------- src/Magnum/Buffer.cpp | 18 +++---- src/Magnum/Buffer.h | 18 +++---- src/Magnum/BufferTexture.cpp | 4 +- src/Magnum/BufferTexture.h | 4 +- src/Magnum/Framebuffer.cpp | 8 +-- src/Magnum/Framebuffer.h | 8 +-- src/Magnum/Implementation/BufferState.cpp | 18 +++---- .../Implementation/FramebufferState.cpp | 20 ++++---- src/Magnum/Implementation/MeshState.cpp | 6 +-- src/Magnum/Implementation/TextureState.cpp | 50 +++++++++---------- src/Magnum/Mesh.cpp | 6 +-- src/Magnum/Mesh.h | 6 +-- src/Magnum/Renderbuffer.cpp | 4 +- src/Magnum/Renderbuffer.h | 4 +- 18 files changed, 139 insertions(+), 139 deletions(-) diff --git a/src/Magnum/AbstractFramebuffer.cpp b/src/Magnum/AbstractFramebuffer.cpp index fcc26147d..80477b214 100644 --- a/src/Magnum/AbstractFramebuffer.cpp +++ b/src/Magnum/AbstractFramebuffer.cpp @@ -270,7 +270,7 @@ GLenum AbstractFramebuffer::checkStatusImplementationDefault(const FramebufferTa } #ifndef MAGNUM_TARGET_GLES -GLenum AbstractFramebuffer::checkStatusImplementationDSA(const FramebufferTarget target) { +GLenum AbstractFramebuffer::checkStatusImplementationDSAEXT(const FramebufferTarget target) { _created = true; return glCheckNamedFramebufferStatusEXT(_id, GLenum(target)); } @@ -295,7 +295,7 @@ void AbstractFramebuffer::drawBuffersImplementationDefault(GLsizei count, const } #ifndef MAGNUM_TARGET_GLES -void AbstractFramebuffer::drawBuffersImplementationDSA(GLsizei count, const GLenum* buffers) { +void AbstractFramebuffer::drawBuffersImplementationDSAEXT(GLsizei count, const GLenum* buffers) { _created = true; glFramebufferDrawBuffersEXT(_id, count, buffers); } @@ -321,7 +321,7 @@ void AbstractFramebuffer::drawBufferImplementationDefault(GLenum buffer) { } #ifndef MAGNUM_TARGET_GLES -void AbstractFramebuffer::drawBufferImplementationDSA(GLenum buffer) { +void AbstractFramebuffer::drawBufferImplementationDSAEXT(GLenum buffer) { _created = true; glFramebufferDrawBufferEXT(_id, buffer); } @@ -345,7 +345,7 @@ void AbstractFramebuffer::readBufferImplementationDefault(GLenum buffer) { } #ifndef MAGNUM_TARGET_GLES -void AbstractFramebuffer::readBufferImplementationDSA(GLenum buffer) { +void AbstractFramebuffer::readBufferImplementationDSAEXT(GLenum buffer) { _created = true; glFramebufferReadBufferEXT(_id, buffer); } diff --git a/src/Magnum/AbstractFramebuffer.h b/src/Magnum/AbstractFramebuffer.h index dea83a065..70d79403b 100644 --- a/src/Magnum/AbstractFramebuffer.h +++ b/src/Magnum/AbstractFramebuffer.h @@ -347,22 +347,22 @@ class MAGNUM_EXPORT AbstractFramebuffer { GLenum MAGNUM_LOCAL checkStatusImplementationDefault(FramebufferTarget target); #ifndef MAGNUM_TARGET_GLES - GLenum MAGNUM_LOCAL checkStatusImplementationDSA(FramebufferTarget target); + GLenum MAGNUM_LOCAL checkStatusImplementationDSAEXT(FramebufferTarget target); #endif void MAGNUM_LOCAL drawBuffersImplementationDefault(GLsizei count, const GLenum* buffers); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL drawBuffersImplementationDSA(GLsizei count, const GLenum* buffers); + void MAGNUM_LOCAL drawBuffersImplementationDSAEXT(GLsizei count, const GLenum* buffers); #endif void MAGNUM_LOCAL drawBufferImplementationDefault(GLenum buffer); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL drawBufferImplementationDSA(GLenum buffer); + void MAGNUM_LOCAL drawBufferImplementationDSAEXT(GLenum buffer); #endif void MAGNUM_LOCAL readBufferImplementationDefault(GLenum buffer); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL readBufferImplementationDSA(GLenum buffer); + void MAGNUM_LOCAL readBufferImplementationDSAEXT(GLenum buffer); #endif static void MAGNUM_LOCAL readImplementationDefault(const Vector2i& offset, const Vector2i& size, ColorFormat format, ColorType type, std::size_t dataSize, GLvoid* data); diff --git a/src/Magnum/AbstractTexture.cpp b/src/Magnum/AbstractTexture.cpp index 912200142..a563911fc 100644 --- a/src/Magnum/AbstractTexture.cpp +++ b/src/Magnum/AbstractTexture.cpp @@ -143,7 +143,7 @@ void AbstractTexture::unbindImplementationMulti(const GLint textureUnit) { glBindTextures(textureUnit, 1, &zero); } -void AbstractTexture::unbindImplementationDSA(const GLint textureUnit) { +void AbstractTexture::unbindImplementationDSAEXT(const GLint textureUnit) { Implementation::TextureState* const textureState = Context::current()->state().texture; CORRADE_INTERNAL_ASSERT(textureState->bindings[textureUnit].first != 0); @@ -261,7 +261,7 @@ void AbstractTexture::bindImplementationMulti(GLint textureUnit) { glBindTextures(textureUnit, 1, &_id); } -void AbstractTexture::bindImplementationDSA(GLint textureUnit) { +void AbstractTexture::bindImplementationDSAEXT(GLint textureUnit) { _created = true; glBindMultiTextureEXT(GL_TEXTURE0 + textureUnit, _target, _id); } @@ -388,7 +388,7 @@ void AbstractTexture::mipmapImplementationDefault() { } #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::mipmapImplementationDSA() { +void AbstractTexture::mipmapImplementationDSAEXT() { _created = true; glGenerateTextureMipmapEXT(_id, _target); } @@ -797,7 +797,7 @@ void AbstractTexture::parameterImplementationDefault(GLenum parameter, GLint val } #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::parameterImplementationDSA(GLenum parameter, GLint value) { +void AbstractTexture::parameterImplementationDSAEXT(GLenum parameter, GLint value) { _created = true; glTextureParameteriEXT(_id, _target, parameter, value); } @@ -809,7 +809,7 @@ void AbstractTexture::parameterImplementationDefault(GLenum parameter, GLfloat v } #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::parameterImplementationDSA(GLenum parameter, GLfloat value) { +void AbstractTexture::parameterImplementationDSAEXT(GLenum parameter, GLfloat value) { _created = true; glTextureParameterfEXT(_id, _target, parameter, value); } @@ -822,7 +822,7 @@ void AbstractTexture::parameterImplementationDefault(GLenum parameter, const GLi } #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::parameterImplementationDSA(GLenum parameter, const GLint* values) { +void AbstractTexture::parameterImplementationDSAEXT(GLenum parameter, const GLint* values) { _created = true; glTextureParameterivEXT(_id, _target, parameter, values); } @@ -835,7 +835,7 @@ void AbstractTexture::parameterImplementationDefault(GLenum parameter, const GLf } #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::parameterImplementationDSA(GLenum parameter, const GLfloat* values) { +void AbstractTexture::parameterImplementationDSAEXT(GLenum parameter, const GLfloat* values) { _created = true; glTextureParameterfvEXT(_id, _target, parameter, values); } @@ -847,7 +847,7 @@ void AbstractTexture::parameterIImplementationDefault(GLenum parameter, const GL glTexParameterIuiv(_target, parameter, values); } -void AbstractTexture::parameterIImplementationDSA(GLenum parameter, const GLuint* values) { +void AbstractTexture::parameterIImplementationDSAEXT(GLenum parameter, const GLuint* values) { _created = true; glTextureParameterIuivEXT(_id, _target, parameter, values); } @@ -857,7 +857,7 @@ void AbstractTexture::parameterIImplementationDefault(GLenum parameter, const GL glTexParameterIiv(_target, parameter, values); } -void AbstractTexture::parameterIImplementationDSA(GLenum parameter, const GLint* values) { +void AbstractTexture::parameterIImplementationDSAEXT(GLenum parameter, const GLint* values) { _created = true; glTextureParameterIivEXT(_id, _target, parameter, values); } @@ -876,7 +876,7 @@ void AbstractTexture::getLevelParameterImplementationDefault(GLenum target, GLin } #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::getLevelParameterImplementationDSA(GLenum target, GLint level, GLenum parameter, GLint* values) { +void AbstractTexture::getLevelParameterImplementationDSAEXT(GLenum target, GLint level, GLenum parameter, GLint* values) { _created = true; glGetTextureLevelParameterivEXT(_id, target, level, parameter, values); } @@ -900,7 +900,7 @@ void AbstractTexture::storageImplementationDefault(GLenum target, GLsizei levels glTexStorage1D(target, levels, GLenum(internalFormat), size[0]); } -void AbstractTexture::storageImplementationDSA(GLenum target, GLsizei levels, TextureFormat internalFormat, const Math::Vector<1, GLsizei>& size) { +void AbstractTexture::storageImplementationDSAEXT(GLenum target, GLsizei levels, TextureFormat internalFormat, const Math::Vector<1, GLsizei>& size) { _created = true; glTextureStorage1DEXT(_id, target, levels, GLenum(internalFormat), size[0]); } @@ -961,7 +961,7 @@ void AbstractTexture::storageImplementationDefault(GLenum target, GLsizei levels } #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::storageImplementationDSA(GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector2i& size) { +void AbstractTexture::storageImplementationDSAEXT(GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector2i& size) { _created = true; glTextureStorage2DEXT(_id, target, levels, GLenum(internalFormat), size.x(), size.y()); } @@ -1016,7 +1016,7 @@ void AbstractTexture::storageImplementationDefault(GLenum target, GLsizei levels } #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::storageImplementationDSA(GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector3i& size) { +void AbstractTexture::storageImplementationDSAEXT(GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector3i& size) { _created = true; glTextureStorage3DEXT(_id, target, levels, GLenum(internalFormat), size.x(), size.y(), size.z()); } @@ -1037,7 +1037,7 @@ void AbstractTexture::storageMultisampleImplementationDefault(const GLenum targe #endif #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::storageMultisampleImplementationDSA(const GLenum target, const GLsizei samples, const TextureFormat internalFormat, const Vector2i& size, const GLboolean fixedSampleLocations) { +void AbstractTexture::storageMultisampleImplementationDSAEXT(const GLenum target, const GLsizei samples, const TextureFormat internalFormat, const Vector2i& size, const GLboolean fixedSampleLocations) { _created = true; glTextureStorage2DMultisampleEXT(_id, target, samples, GLenum(internalFormat), size.x(), size.y(), fixedSampleLocations); } @@ -1052,7 +1052,7 @@ void AbstractTexture::storageMultisampleImplementationDefault(const GLenum targe glTexStorage3DMultisample(target, samples, GLenum(internalFormat), size.x(), size.y(), size.z(), fixedSampleLocations); } -void AbstractTexture::storageMultisampleImplementationDSA(const GLenum target, const GLsizei samples, const TextureFormat internalFormat, const Vector3i& size, const GLboolean fixedSampleLocations) { +void AbstractTexture::storageMultisampleImplementationDSAEXT(const GLenum target, const GLsizei samples, const TextureFormat internalFormat, const Vector3i& size, const GLboolean fixedSampleLocations) { _created = true; glTextureStorage3DMultisampleEXT(_id, target, samples, GLenum(internalFormat), size.x(), size.y(), size.z(), fixedSampleLocations); } @@ -1064,7 +1064,7 @@ void AbstractTexture::getImageImplementationDefault(const GLenum target, const G glGetTexImage(target, level, GLenum(format), GLenum(type), data); } -void AbstractTexture::getImageImplementationDSA(const GLenum target, const GLint level, const ColorFormat format, const ColorType type, const std::size_t, GLvoid* const data) { +void AbstractTexture::getImageImplementationDSAEXT(const GLenum target, const GLint level, const ColorFormat format, const ColorType type, const std::size_t, GLvoid* const data) { _created = true; glGetTextureImageEXT(_id, target, level, GLenum(format), GLenum(type), data); } @@ -1081,7 +1081,7 @@ void AbstractTexture::imageImplementationDefault(GLenum target, GLint level, Tex glTexImage1D(target, level, GLint(internalFormat), size[0], 0, GLenum(format), GLenum(type), data); } -void AbstractTexture::imageImplementationDSA(GLenum target, GLint level, TextureFormat internalFormat, const Math::Vector<1, GLsizei>& size, ColorFormat format, ColorType type, const GLvoid* data) { +void AbstractTexture::imageImplementationDSAEXT(GLenum target, GLint level, TextureFormat internalFormat, const Math::Vector<1, GLsizei>& size, ColorFormat format, ColorType type, const GLvoid* data) { _created = true; glTextureImage1DEXT(_id, target, level, GLint(internalFormat), size[0], 0, GLenum(format), GLenum(type), data); } @@ -1093,7 +1093,7 @@ void AbstractTexture::imageImplementationDefault(GLenum target, GLint level, Tex } #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::imageImplementationDSA(GLenum target, GLint level, TextureFormat internalFormat, const Vector2i& size, ColorFormat format, ColorType type, const GLvoid* data) { +void AbstractTexture::imageImplementationDSAEXT(GLenum target, GLint level, TextureFormat internalFormat, const Vector2i& size, ColorFormat format, ColorType type, const GLvoid* data) { _created = true; glTextureImage2DEXT(_id, target, level, GLint(internalFormat), size.x(), size.y(), 0, GLenum(format), GLenum(type), data); } @@ -1118,7 +1118,7 @@ void AbstractTexture::imageImplementationDefault(GLenum target, GLint level, Tex } #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::imageImplementationDSA(GLenum target, GLint level, TextureFormat internalFormat, const Vector3i& size, ColorFormat format, ColorType type, const GLvoid* data) { +void AbstractTexture::imageImplementationDSAEXT(GLenum target, GLint level, TextureFormat internalFormat, const Vector3i& size, ColorFormat format, ColorType type, const GLvoid* data) { _created = true; glTextureImage3DEXT(_id, target, level, GLint(internalFormat), size.x(), size.y(), size.z(), 0, GLenum(format), GLenum(type), data); } @@ -1130,7 +1130,7 @@ void AbstractTexture::subImageImplementationDefault(GLenum target, GLint level, glTexSubImage1D(target, level, offset[0], size[0], GLenum(format), GLenum(type), data); } -void AbstractTexture::subImageImplementationDSA(GLenum target, GLint level, const Math::Vector<1, GLint>& offset, const Math::Vector<1, GLsizei>& size, ColorFormat format, ColorType type, const GLvoid* data) { +void AbstractTexture::subImageImplementationDSAEXT(GLenum target, GLint level, const Math::Vector<1, GLint>& offset, const Math::Vector<1, GLsizei>& size, ColorFormat format, ColorType type, const GLvoid* data) { _created = true; glTextureSubImage1DEXT(_id, target, level, offset[0], size[0], GLenum(format), GLenum(type), data); } @@ -1142,7 +1142,7 @@ void AbstractTexture::subImageImplementationDefault(GLenum target, GLint level, } #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::subImageImplementationDSA(GLenum target, GLint level, const Vector2i& offset, const Vector2i& size, ColorFormat format, ColorType type, const GLvoid* data) { +void AbstractTexture::subImageImplementationDSAEXT(GLenum target, GLint level, const Vector2i& offset, const Vector2i& size, ColorFormat format, ColorType type, const GLvoid* data) { _created = true; glTextureSubImage2DEXT(_id, target, level, offset.x(), offset.y(), size.x(), size.y(), GLenum(format), GLenum(type), data); } @@ -1167,7 +1167,7 @@ void AbstractTexture::subImageImplementationDefault(GLenum target, GLint level, } #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::subImageImplementationDSA(GLenum target, GLint level, const Vector3i& offset, const Vector3i& size, ColorFormat format, ColorType type, const GLvoid* data) { +void AbstractTexture::subImageImplementationDSAEXT(GLenum target, GLint level, const Vector3i& offset, const Vector3i& size, ColorFormat format, ColorType type, const GLvoid* data) { _created = true; glTextureSubImage3DEXT(_id, target, level, offset.x(), offset.y(), offset.z(), size.x(), size.y(), size.z(), GLenum(format), GLenum(type), data); } diff --git a/src/Magnum/AbstractTexture.h b/src/Magnum/AbstractTexture.h index 4f2308490..247bc6788 100644 --- a/src/Magnum/AbstractTexture.h +++ b/src/Magnum/AbstractTexture.h @@ -371,7 +371,7 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject { static void MAGNUM_LOCAL unbindImplementationDefault(GLint textureUnit); #ifndef MAGNUM_TARGET_GLES static void MAGNUM_LOCAL unbindImplementationMulti(GLint textureUnit); - static void MAGNUM_LOCAL unbindImplementationDSA(GLint textureUnit); + static void MAGNUM_LOCAL unbindImplementationDSAEXT(GLint textureUnit); #endif static void MAGNUM_LOCAL bindImplementationFallback(GLint firstTextureUnit, Containers::ArrayReference textures); @@ -384,7 +384,7 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject { void MAGNUM_LOCAL bindImplementationDefault(GLint textureUnit); #ifndef MAGNUM_TARGET_GLES void MAGNUM_LOCAL bindImplementationMulti(GLint textureUnit); - void MAGNUM_LOCAL bindImplementationDSA(GLint textureUnit); + void MAGNUM_LOCAL bindImplementationDSAEXT(GLint textureUnit); #endif void MAGNUM_LOCAL parameterImplementationDefault(GLenum parameter, GLint value); @@ -398,12 +398,12 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject { void MAGNUM_LOCAL parameterIImplementationDefault(GLenum parameter, const GLint* values); #endif #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL parameterImplementationDSA(GLenum parameter, GLint value); - void MAGNUM_LOCAL parameterImplementationDSA(GLenum parameter, GLfloat value); - void MAGNUM_LOCAL parameterImplementationDSA(GLenum parameter, const GLint* values); - void MAGNUM_LOCAL parameterImplementationDSA(GLenum parameter, const GLfloat* values); - void MAGNUM_LOCAL parameterIImplementationDSA(GLenum parameter, const GLuint* values); - void MAGNUM_LOCAL parameterIImplementationDSA(GLenum parameter, const GLint* values); + void MAGNUM_LOCAL parameterImplementationDSAEXT(GLenum parameter, GLint value); + void MAGNUM_LOCAL parameterImplementationDSAEXT(GLenum parameter, GLfloat value); + void MAGNUM_LOCAL parameterImplementationDSAEXT(GLenum parameter, const GLint* values); + void MAGNUM_LOCAL parameterImplementationDSAEXT(GLenum parameter, const GLfloat* values); + void MAGNUM_LOCAL parameterIImplementationDSAEXT(GLenum parameter, const GLuint* values); + void MAGNUM_LOCAL parameterIImplementationDSAEXT(GLenum parameter, const GLint* values); #endif void MAGNUM_LOCAL setMaxAnisotropyImplementationNoOp(GLfloat); @@ -412,31 +412,31 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject { #ifndef MAGNUM_TARGET_GLES2 void MAGNUM_LOCAL getLevelParameterImplementationDefault(GLenum target, GLint level, GLenum parameter, GLint* values); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL getLevelParameterImplementationDSA(GLenum target, GLint level, GLenum parameter, GLint* values); + void MAGNUM_LOCAL getLevelParameterImplementationDSAEXT(GLenum target, GLint level, GLenum parameter, GLint* values); #endif #endif void MAGNUM_LOCAL mipmapImplementationDefault(); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL mipmapImplementationDSA(); + void MAGNUM_LOCAL mipmapImplementationDSAEXT(); #endif #ifndef MAGNUM_TARGET_GLES void MAGNUM_LOCAL storageImplementationFallback(GLenum target, GLsizei levels, TextureFormat internalFormat, const Math::Vector<1, GLsizei>& size); void MAGNUM_LOCAL storageImplementationDefault(GLenum target, GLsizei levels, TextureFormat internalFormat, const Math::Vector<1, GLsizei>& size); - void MAGNUM_LOCAL storageImplementationDSA(GLenum target, GLsizei levels, TextureFormat internalFormat, const Math::Vector<1, GLsizei>& size); + void MAGNUM_LOCAL storageImplementationDSAEXT(GLenum target, GLsizei levels, TextureFormat internalFormat, const Math::Vector<1, GLsizei>& size); #endif void MAGNUM_LOCAL storageImplementationFallback(GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector2i& size); void MAGNUM_LOCAL storageImplementationDefault(GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector2i& size); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL storageImplementationDSA(GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector2i& size); + void MAGNUM_LOCAL storageImplementationDSAEXT(GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector2i& size); #endif void MAGNUM_LOCAL storageImplementationFallback(GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector3i& size); void MAGNUM_LOCAL storageImplementationDefault(GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector3i& size); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL storageImplementationDSA(GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector3i& size); + void MAGNUM_LOCAL storageImplementationDSAEXT(GLenum target, GLsizei levels, TextureFormat internalFormat, const Vector3i& size); #endif #ifndef MAGNUM_TARGET_GLES @@ -446,49 +446,49 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject { void MAGNUM_LOCAL storageMultisampleImplementationDefault(GLenum target, GLsizei samples, TextureFormat internalFormat, const Vector2i& size, GLboolean fixedsamplelocations); #endif #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL storageMultisampleImplementationDSA(GLenum target, GLsizei samples, TextureFormat internalFormat, const Vector2i& size, GLboolean fixedsamplelocations); + void MAGNUM_LOCAL storageMultisampleImplementationDSAEXT(GLenum target, GLsizei samples, TextureFormat internalFormat, const Vector2i& size, GLboolean fixedsamplelocations); #endif #ifndef MAGNUM_TARGET_GLES void MAGNUM_LOCAL storageMultisampleImplementationFallback(GLenum target, GLsizei samples, TextureFormat internalFormat, const Vector3i& size, GLboolean fixedsamplelocations); void MAGNUM_LOCAL storageMultisampleImplementationDefault(GLenum target, GLsizei samples, TextureFormat internalFormat, const Vector3i& size, GLboolean fixedsamplelocations); - void MAGNUM_LOCAL storageMultisampleImplementationDSA(GLenum target, GLsizei samples, TextureFormat internalFormat, const Vector3i& size, GLboolean fixedsamplelocations); + void MAGNUM_LOCAL storageMultisampleImplementationDSAEXT(GLenum target, GLsizei samples, TextureFormat internalFormat, const Vector3i& size, GLboolean fixedsamplelocations); #endif #ifndef MAGNUM_TARGET_GLES void MAGNUM_LOCAL getImageImplementationDefault(GLenum target, GLint level, ColorFormat format, ColorType type, std::size_t dataSize, GLvoid* data); - void MAGNUM_LOCAL getImageImplementationDSA(GLenum target, GLint level, ColorFormat format, ColorType type, std::size_t dataSize, GLvoid* data); + void MAGNUM_LOCAL getImageImplementationDSAEXT(GLenum target, GLint level, ColorFormat format, ColorType type, std::size_t dataSize, GLvoid* data); void MAGNUM_LOCAL getImageImplementationRobustness(GLenum target, GLint level, ColorFormat format, ColorType type, std::size_t dataSize, GLvoid* data); #endif #ifndef MAGNUM_TARGET_GLES void MAGNUM_LOCAL imageImplementationDefault(GLenum target, GLint level, TextureFormat internalFormat, const Math::Vector<1, GLsizei>& size, ColorFormat format, ColorType type, const GLvoid* data); - void MAGNUM_LOCAL imageImplementationDSA(GLenum target, GLint level, TextureFormat internalFormat, const Math::Vector<1, GLsizei>& size, ColorFormat format, ColorType type, const GLvoid* data); + void MAGNUM_LOCAL imageImplementationDSAEXT(GLenum target, GLint level, TextureFormat internalFormat, const Math::Vector<1, GLsizei>& size, ColorFormat format, ColorType type, const GLvoid* data); #endif void MAGNUM_LOCAL imageImplementationDefault(GLenum target, GLint level, TextureFormat internalFormat, const Vector2i& size, ColorFormat format, ColorType type, const GLvoid* data); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL imageImplementationDSA(GLenum target, GLint level, TextureFormat internalFormat, const Vector2i& size, ColorFormat format, ColorType type, const GLvoid* data); + void MAGNUM_LOCAL imageImplementationDSAEXT(GLenum target, GLint level, TextureFormat internalFormat, const Vector2i& size, ColorFormat format, ColorType type, const GLvoid* data); #endif void MAGNUM_LOCAL imageImplementationDefault(GLenum target, GLint level, TextureFormat internalFormat, const Vector3i& size, ColorFormat format, ColorType type, const GLvoid* data); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL imageImplementationDSA(GLenum target, GLint level, TextureFormat internalFormat, const Vector3i& size, ColorFormat format, ColorType type, const GLvoid* data); + void MAGNUM_LOCAL imageImplementationDSAEXT(GLenum target, GLint level, TextureFormat internalFormat, const Vector3i& size, ColorFormat format, ColorType type, const GLvoid* data); #endif #ifndef MAGNUM_TARGET_GLES void MAGNUM_LOCAL subImageImplementationDefault(GLenum target, GLint level, const Math::Vector<1, GLint>& offset, const Math::Vector<1, GLsizei>& size, ColorFormat format, ColorType type, const GLvoid* data); - void MAGNUM_LOCAL subImageImplementationDSA(GLenum target, GLint level, const Math::Vector<1, GLint>& offset, const Math::Vector<1, GLsizei>& size, ColorFormat format, ColorType type, const GLvoid* data); + void MAGNUM_LOCAL subImageImplementationDSAEXT(GLenum target, GLint level, const Math::Vector<1, GLint>& offset, const Math::Vector<1, GLsizei>& size, ColorFormat format, ColorType type, const GLvoid* data); #endif void MAGNUM_LOCAL subImageImplementationDefault(GLenum target, GLint level, const Vector2i& offset, const Vector2i& size, ColorFormat format, ColorType type, const GLvoid* data); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL subImageImplementationDSA(GLenum target, GLint level, const Vector2i& offset, const Vector2i& size, ColorFormat format, ColorType type, const GLvoid* data); + void MAGNUM_LOCAL subImageImplementationDSAEXT(GLenum target, GLint level, const Vector2i& offset, const Vector2i& size, ColorFormat format, ColorType type, const GLvoid* data); #endif void MAGNUM_LOCAL subImageImplementationDefault(GLenum target, GLint level, const Vector3i& offset, const Vector3i& size, ColorFormat format, ColorType type, const GLvoid* data); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL subImageImplementationDSA(GLenum target, GLint level, const Vector3i& offset, const Vector3i& size, ColorFormat format, ColorType type, const GLvoid* data); + void MAGNUM_LOCAL subImageImplementationDSAEXT(GLenum target, GLint level, const Vector3i& offset, const Vector3i& size, ColorFormat format, ColorType type, const GLvoid* data); #endif void MAGNUM_LOCAL invalidateImageImplementationNoOp(GLint level); diff --git a/src/Magnum/Buffer.cpp b/src/Magnum/Buffer.cpp index 950cfab21..5670a5714 100644 --- a/src/Magnum/Buffer.cpp +++ b/src/Magnum/Buffer.cpp @@ -402,7 +402,7 @@ void Buffer::copyImplementationDefault(Buffer& read, Buffer& write, GLintptr rea } #ifndef MAGNUM_TARGET_GLES -void Buffer::copyImplementationDSA(Buffer& read, Buffer& write, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size) { +void Buffer::copyImplementationDSAEXT(Buffer& read, Buffer& write, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size) { read._created = write._created = true; glNamedCopyBufferSubDataEXT(read._id, write._id, readOffset, writeOffset, size); } @@ -414,7 +414,7 @@ void Buffer::getParameterImplementationDefault(const GLenum value, GLint* const } #ifndef MAGNUM_TARGET_GLES -void Buffer::getParameterImplementationDSA(const GLenum value, GLint* const data) { +void Buffer::getParameterImplementationDSAEXT(const GLenum value, GLint* const data) { _created = true; glGetNamedBufferParameterivEXT(_id, value, data); } @@ -425,7 +425,7 @@ void Buffer::getSubDataImplementationDefault(const GLintptr offset, const GLsize glGetBufferSubData(GLenum(bindSomewhereInternal(_targetHint)), offset, size, data); } -void Buffer::getSubDataImplementationDSA(const GLintptr offset, const GLsizeiptr size, GLvoid* const data) { +void Buffer::getSubDataImplementationDSAEXT(const GLintptr offset, const GLsizeiptr size, GLvoid* const data) { _created = true; glGetNamedBufferSubDataEXT(_id, offset, size, data); } @@ -436,7 +436,7 @@ void Buffer::dataImplementationDefault(GLsizeiptr size, const GLvoid* data, Buff } #ifndef MAGNUM_TARGET_GLES -void Buffer::dataImplementationDSA(GLsizeiptr size, const GLvoid* data, BufferUsage usage) { +void Buffer::dataImplementationDSAEXT(GLsizeiptr size, const GLvoid* data, BufferUsage usage) { _created = true; glNamedBufferDataEXT(_id, size, data, GLenum(usage)); } @@ -447,7 +447,7 @@ void Buffer::subDataImplementationDefault(GLintptr offset, GLsizeiptr size, cons } #ifndef MAGNUM_TARGET_GLES -void Buffer::subDataImplementationDSA(GLintptr offset, GLsizeiptr size, const GLvoid* data) { +void Buffer::subDataImplementationDSAEXT(GLintptr offset, GLsizeiptr size, const GLvoid* data) { _created = true; glNamedBufferSubDataEXT(_id, offset, size, data); } @@ -483,7 +483,7 @@ void* Buffer::mapImplementationDefault(MapAccess access) { } #ifndef MAGNUM_TARGET_GLES -void* Buffer::mapImplementationDSA(MapAccess access) { +void* Buffer::mapImplementationDSAEXT(MapAccess access) { _created = true; return glMapNamedBufferEXT(_id, GLenum(access)); } @@ -503,7 +503,7 @@ void* Buffer::mapRangeImplementationDefault(GLintptr offset, GLsizeiptr length, } #ifndef MAGNUM_TARGET_GLES -void* Buffer::mapRangeImplementationDSA(GLintptr offset, GLsizeiptr length, MapFlags access) { +void* Buffer::mapRangeImplementationDSAEXT(GLintptr offset, GLsizeiptr length, MapFlags access) { _created = true; return glMapNamedBufferRangeEXT(_id, offset, length, GLenum(access)); } @@ -522,7 +522,7 @@ void Buffer::flushMappedRangeImplementationDefault(GLintptr offset, GLsizeiptr l } #ifndef MAGNUM_TARGET_GLES -void Buffer::flushMappedRangeImplementationDSA(GLintptr offset, GLsizeiptr length) { +void Buffer::flushMappedRangeImplementationDSAEXT(GLintptr offset, GLsizeiptr length) { _created = true; glFlushMappedNamedBufferRangeEXT(_id, offset, length); } @@ -539,7 +539,7 @@ bool Buffer::unmapImplementationDefault() { } #ifndef MAGNUM_TARGET_GLES -bool Buffer::unmapImplementationDSA() { +bool Buffer::unmapImplementationDSAEXT() { _created = true; return glUnmapNamedBufferEXT(_id); } diff --git a/src/Magnum/Buffer.h b/src/Magnum/Buffer.h index 3e16a3b4a..3f4927cba 100644 --- a/src/Magnum/Buffer.h +++ b/src/Magnum/Buffer.h @@ -1171,7 +1171,7 @@ class MAGNUM_EXPORT Buffer: public AbstractObject { static void MAGNUM_LOCAL copyImplementationDefault(Buffer& read, Buffer& write, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); #ifndef MAGNUM_TARGET_GLES - static void MAGNUM_LOCAL copyImplementationDSA(Buffer& read, Buffer& write, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); + static void MAGNUM_LOCAL copyImplementationDSAEXT(Buffer& read, Buffer& write, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); #endif #endif @@ -1185,22 +1185,22 @@ class MAGNUM_EXPORT Buffer: public AbstractObject { void MAGNUM_LOCAL getParameterImplementationDefault(GLenum value, GLint* data); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL getParameterImplementationDSA(GLenum value, GLint* data); + void MAGNUM_LOCAL getParameterImplementationDSAEXT(GLenum value, GLint* data); #endif #ifndef MAGNUM_TARGET_GLES void MAGNUM_LOCAL getSubDataImplementationDefault(GLintptr offset, GLsizeiptr size, GLvoid* data); - void MAGNUM_LOCAL getSubDataImplementationDSA(GLintptr offset, GLsizeiptr size, GLvoid* data); + void MAGNUM_LOCAL getSubDataImplementationDSAEXT(GLintptr offset, GLsizeiptr size, GLvoid* data); #endif void MAGNUM_LOCAL dataImplementationDefault(GLsizeiptr size, const GLvoid* data, BufferUsage usage); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL dataImplementationDSA(GLsizeiptr size, const GLvoid* data, BufferUsage usage); + void MAGNUM_LOCAL dataImplementationDSAEXT(GLsizeiptr size, const GLvoid* data, BufferUsage usage); #endif void MAGNUM_LOCAL subDataImplementationDefault(GLintptr offset, GLsizeiptr size, const GLvoid* data); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL subDataImplementationDSA(GLintptr offset, GLsizeiptr size, const GLvoid* data); + void MAGNUM_LOCAL subDataImplementationDSAEXT(GLintptr offset, GLsizeiptr size, const GLvoid* data); #endif void MAGNUM_LOCAL invalidateImplementationNoOp(); @@ -1215,22 +1215,22 @@ class MAGNUM_EXPORT Buffer: public AbstractObject { void MAGNUM_LOCAL * mapImplementationDefault(MapAccess access); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL * mapImplementationDSA(MapAccess access); + void MAGNUM_LOCAL * mapImplementationDSAEXT(MapAccess access); #endif void MAGNUM_LOCAL * mapRangeImplementationDefault(GLintptr offset, GLsizeiptr length, MapFlags access); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL * mapRangeImplementationDSA(GLintptr offset, GLsizeiptr length, MapFlags access); + void MAGNUM_LOCAL * mapRangeImplementationDSAEXT(GLintptr offset, GLsizeiptr length, MapFlags access); #endif void MAGNUM_LOCAL flushMappedRangeImplementationDefault(GLintptr offset, GLsizeiptr length); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL flushMappedRangeImplementationDSA(GLintptr offset, GLsizeiptr length); + void MAGNUM_LOCAL flushMappedRangeImplementationDSAEXT(GLintptr offset, GLsizeiptr length); #endif bool MAGNUM_LOCAL unmapImplementationDefault(); #ifndef MAGNUM_TARGET_GLES - bool MAGNUM_LOCAL unmapImplementationDSA(); + bool MAGNUM_LOCAL unmapImplementationDSAEXT(); #endif GLuint _id; diff --git a/src/Magnum/BufferTexture.cpp b/src/Magnum/BufferTexture.cpp index 54384f45a..0c45eb264 100644 --- a/src/Magnum/BufferTexture.cpp +++ b/src/Magnum/BufferTexture.cpp @@ -75,7 +75,7 @@ void BufferTexture::setBufferImplementationDefault(BufferTextureFormat internalF glTexBuffer(GL_TEXTURE_BUFFER, GLenum(internalFormat), buffer.id()); } -void BufferTexture::setBufferImplementationDSA(BufferTextureFormat internalFormat, Buffer& buffer) { +void BufferTexture::setBufferImplementationDSAEXT(BufferTextureFormat internalFormat, Buffer& buffer) { glTextureBufferEXT(id(), GL_TEXTURE_BUFFER, GLenum(internalFormat), buffer.id()); } @@ -84,7 +84,7 @@ void BufferTexture::setBufferRangeImplementationDefault(BufferTextureFormat inte glTexBufferRange(GL_TEXTURE_BUFFER, GLenum(internalFormat), buffer.id(), offset, size); } -void BufferTexture::setBufferRangeImplementationDSA(BufferTextureFormat internalFormat, Buffer& buffer, GLintptr offset, GLsizeiptr size) { +void BufferTexture::setBufferRangeImplementationDSAEXT(BufferTextureFormat internalFormat, Buffer& buffer, GLintptr offset, GLsizeiptr size) { glTextureBufferRangeEXT(id(), GL_TEXTURE_BUFFER, GLenum(internalFormat), buffer.id(), offset, size); } diff --git a/src/Magnum/BufferTexture.h b/src/Magnum/BufferTexture.h index 402edc063..2ce20a191 100644 --- a/src/Magnum/BufferTexture.h +++ b/src/Magnum/BufferTexture.h @@ -277,10 +277,10 @@ class MAGNUM_EXPORT BufferTexture: public AbstractTexture { private: void MAGNUM_LOCAL setBufferImplementationDefault(BufferTextureFormat internalFormat, Buffer& buffer); - void MAGNUM_LOCAL setBufferImplementationDSA(BufferTextureFormat internalFormat, Buffer& buffer); + void MAGNUM_LOCAL setBufferImplementationDSAEXT(BufferTextureFormat internalFormat, Buffer& buffer); void MAGNUM_LOCAL setBufferRangeImplementationDefault(BufferTextureFormat internalFormat, Buffer& buffer, GLintptr offset, GLsizeiptr size); - void MAGNUM_LOCAL setBufferRangeImplementationDSA(BufferTextureFormat internalFormat, Buffer& buffer, GLintptr offset, GLsizeiptr size); + void MAGNUM_LOCAL setBufferRangeImplementationDSAEXT(BufferTextureFormat internalFormat, Buffer& buffer, GLintptr offset, GLsizeiptr size); }; } diff --git a/src/Magnum/Framebuffer.cpp b/src/Magnum/Framebuffer.cpp index a1357979f..0e910038d 100644 --- a/src/Magnum/Framebuffer.cpp +++ b/src/Magnum/Framebuffer.cpp @@ -257,7 +257,7 @@ void Framebuffer::renderbufferImplementationDefault(BufferAttachment attachment, } #ifndef MAGNUM_TARGET_GLES -void Framebuffer::renderbufferImplementationDSA(BufferAttachment attachment, Renderbuffer& renderbuffer) { +void Framebuffer::renderbufferImplementationDSAEXT(BufferAttachment attachment, Renderbuffer& renderbuffer) { _created = true; glNamedFramebufferRenderbufferEXT(_id, GLenum(attachment), GL_RENDERBUFFER, renderbuffer.id()); } @@ -266,7 +266,7 @@ void Framebuffer::texture1DImplementationDefault(BufferAttachment attachment, GL glFramebufferTexture1D(GLenum(bindInternal()), GLenum(attachment), GL_TEXTURE_1D, textureId, mipLevel); } -void Framebuffer::texture1DImplementationDSA(BufferAttachment attachment, GLuint textureId, GLint mipLevel) { +void Framebuffer::texture1DImplementationDSAEXT(BufferAttachment attachment, GLuint textureId, GLint mipLevel) { _created = true; glNamedFramebufferTexture1DEXT(_id, GLenum(attachment), GL_TEXTURE_1D, textureId, mipLevel); } @@ -277,7 +277,7 @@ void Framebuffer::texture2DImplementationDefault(BufferAttachment attachment, GL } #ifndef MAGNUM_TARGET_GLES -void Framebuffer::texture2DImplementationDSA(BufferAttachment attachment, GLenum textureTarget, GLuint textureId, GLint mipLevel) { +void Framebuffer::texture2DImplementationDSAEXT(BufferAttachment attachment, GLenum textureTarget, GLuint textureId, GLint mipLevel) { _created = true; glNamedFramebufferTexture2DEXT(_id, GLenum(attachment), textureTarget, textureId, mipLevel); } @@ -298,7 +298,7 @@ void Framebuffer::textureLayerImplementationDefault(BufferAttachment attachment, } #ifndef MAGNUM_TARGET_GLES -void Framebuffer::textureLayerImplementationDSA(BufferAttachment attachment, GLuint textureId, GLint mipLevel, GLint layer) { +void Framebuffer::textureLayerImplementationDSAEXT(BufferAttachment attachment, GLuint textureId, GLint mipLevel, GLint layer) { _created = true; glNamedFramebufferTextureLayerEXT(_id, GLenum(attachment), textureId, mipLevel, layer); } diff --git a/src/Magnum/Framebuffer.h b/src/Magnum/Framebuffer.h index c264aa0bf..2c9cdc3f9 100644 --- a/src/Magnum/Framebuffer.h +++ b/src/Magnum/Framebuffer.h @@ -639,22 +639,22 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje void MAGNUM_LOCAL renderbufferImplementationDefault(BufferAttachment attachment, Renderbuffer& renderbuffer); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL renderbufferImplementationDSA(BufferAttachment attachment, Renderbuffer& renderbuffer); + void MAGNUM_LOCAL renderbufferImplementationDSAEXT(BufferAttachment attachment, Renderbuffer& renderbuffer); #endif #ifndef MAGNUM_TARGET_GLES void MAGNUM_LOCAL texture1DImplementationDefault(BufferAttachment attachment, GLuint textureId, GLint level); - void MAGNUM_LOCAL texture1DImplementationDSA(BufferAttachment attachment, GLuint textureId, GLint level); + void MAGNUM_LOCAL texture1DImplementationDSAEXT(BufferAttachment attachment, GLuint textureId, GLint level); #endif void MAGNUM_LOCAL texture2DImplementationDefault(BufferAttachment attachment, GLenum textureTarget, GLuint textureId, GLint level); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL texture2DImplementationDSA(BufferAttachment attachment, GLenum textureTarget, GLuint textureId, GLint level); + void MAGNUM_LOCAL texture2DImplementationDSAEXT(BufferAttachment attachment, GLenum textureTarget, GLuint textureId, GLint level); #endif void MAGNUM_LOCAL textureLayerImplementationDefault(BufferAttachment attachment, GLuint textureId, GLint level, GLint layer); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL textureLayerImplementationDSA(BufferAttachment attachment, GLuint textureId, GLint level, GLint layer); + void MAGNUM_LOCAL textureLayerImplementationDSAEXT(BufferAttachment attachment, GLuint textureId, GLint level, GLint layer); #endif }; diff --git a/src/Magnum/Implementation/BufferState.cpp b/src/Magnum/Implementation/BufferState.cpp index 12ea300ae..42102971e 100644 --- a/src/Magnum/Implementation/BufferState.cpp +++ b/src/Magnum/Implementation/BufferState.cpp @@ -90,15 +90,15 @@ BufferState::BufferState(Context& context, std::vector& extensions) if(context.isExtensionSupported()) { extensions.push_back(Extensions::GL::EXT::direct_state_access::string()); - copyImplementation = &Buffer::copyImplementationDSA; - getParameterImplementation = &Buffer::getParameterImplementationDSA; - getSubDataImplementation = &Buffer::getSubDataImplementationDSA; - dataImplementation = &Buffer::dataImplementationDSA; - subDataImplementation = &Buffer::subDataImplementationDSA; - mapImplementation = &Buffer::mapImplementationDSA; - mapRangeImplementation = &Buffer::mapRangeImplementationDSA; - flushMappedRangeImplementation = &Buffer::flushMappedRangeImplementationDSA; - unmapImplementation = &Buffer::unmapImplementationDSA; + copyImplementation = &Buffer::copyImplementationDSAEXT; + getParameterImplementation = &Buffer::getParameterImplementationDSAEXT; + getSubDataImplementation = &Buffer::getSubDataImplementationDSAEXT; + dataImplementation = &Buffer::dataImplementationDSAEXT; + subDataImplementation = &Buffer::subDataImplementationDSAEXT; + mapImplementation = &Buffer::mapImplementationDSAEXT; + mapRangeImplementation = &Buffer::mapRangeImplementationDSAEXT; + flushMappedRangeImplementation = &Buffer::flushMappedRangeImplementationDSAEXT; + unmapImplementation = &Buffer::unmapImplementationDSAEXT; } else #endif { diff --git a/src/Magnum/Implementation/FramebufferState.cpp b/src/Magnum/Implementation/FramebufferState.cpp index 0d49ab50a..34dbfdb58 100644 --- a/src/Magnum/Implementation/FramebufferState.cpp +++ b/src/Magnum/Implementation/FramebufferState.cpp @@ -43,17 +43,17 @@ FramebufferState::FramebufferState(Context& context, std::vector& e if(context.isExtensionSupported()) { extensions.push_back(Extensions::GL::EXT::direct_state_access::string()); - checkStatusImplementation = &AbstractFramebuffer::checkStatusImplementationDSA; - drawBuffersImplementation = &AbstractFramebuffer::drawBuffersImplementationDSA; - drawBufferImplementation = &AbstractFramebuffer::drawBufferImplementationDSA; - readBufferImplementation = &AbstractFramebuffer::readBufferImplementationDSA; + checkStatusImplementation = &AbstractFramebuffer::checkStatusImplementationDSAEXT; + drawBuffersImplementation = &AbstractFramebuffer::drawBuffersImplementationDSAEXT; + drawBufferImplementation = &AbstractFramebuffer::drawBufferImplementationDSAEXT; + readBufferImplementation = &AbstractFramebuffer::readBufferImplementationDSAEXT; - renderbufferImplementation = &Framebuffer::renderbufferImplementationDSA; - texture1DImplementation = &Framebuffer::texture1DImplementationDSA; - texture2DImplementation = &Framebuffer::texture2DImplementationDSA; - textureLayerImplementation = &Framebuffer::textureLayerImplementationDSA; + renderbufferImplementation = &Framebuffer::renderbufferImplementationDSAEXT; + texture1DImplementation = &Framebuffer::texture1DImplementationDSAEXT; + texture2DImplementation = &Framebuffer::texture2DImplementationDSAEXT; + textureLayerImplementation = &Framebuffer::textureLayerImplementationDSAEXT; - renderbufferStorageImplementation = &Renderbuffer::storageImplementationDSA; + renderbufferStorageImplementation = &Renderbuffer::storageImplementationDSAEXT; } else #endif { @@ -120,7 +120,7 @@ FramebufferState::FramebufferState(Context& context, std::vector& e if(context.isExtensionSupported()) { /* Extension added above */ - renderbufferStorageMultisampleImplementation = &Renderbuffer::storageMultisampleImplementationDSA; + renderbufferStorageMultisampleImplementation = &Renderbuffer::storageMultisampleImplementationDSAEXT; } else #endif { diff --git a/src/Magnum/Implementation/MeshState.cpp b/src/Magnum/Implementation/MeshState.cpp index d7297925b..03977de2a 100644 --- a/src/Magnum/Implementation/MeshState.cpp +++ b/src/Magnum/Implementation/MeshState.cpp @@ -60,9 +60,9 @@ MeshState::MeshState(Context& context, std::vector& extensions): cu if(context.isExtensionSupported()) { extensions.push_back(Extensions::GL::EXT::direct_state_access::string()); - attributePointerImplementation = &Mesh::attributePointerImplementationDSA; - attributeIPointerImplementation = &Mesh::attributePointerImplementationDSA; - attributeLPointerImplementation = &Mesh::attributePointerImplementationDSA; + attributePointerImplementation = &Mesh::attributePointerImplementationDSAEXT; + attributeIPointerImplementation = &Mesh::attributePointerImplementationDSAEXT; + attributeLPointerImplementation = &Mesh::attributePointerImplementationDSAEXT; } else #endif { diff --git a/src/Magnum/Implementation/TextureState.cpp b/src/Magnum/Implementation/TextureState.cpp index b043280e9..0e3399229 100644 --- a/src/Magnum/Implementation/TextureState.cpp +++ b/src/Magnum/Implementation/TextureState.cpp @@ -69,9 +69,9 @@ TextureState::TextureState(Context& context, std::vector& extension } else if(context.isExtensionSupported()) { /* Extension name added below */ - unbindImplementation = &AbstractTexture::unbindImplementationDSA; + unbindImplementation = &AbstractTexture::unbindImplementationDSAEXT; bindMultiImplementation = &AbstractTexture::bindImplementationFallback; - bindImplementation = &AbstractTexture::bindImplementationDSA; + bindImplementation = &AbstractTexture::bindImplementationDSAEXT; } else #endif @@ -86,24 +86,24 @@ TextureState::TextureState(Context& context, std::vector& extension if(context.isExtensionSupported()) { extensions.push_back(Extensions::GL::EXT::direct_state_access::string()); - parameteriImplementation = &AbstractTexture::parameterImplementationDSA; - parameterfImplementation = &AbstractTexture::parameterImplementationDSA; - parameterivImplementation = &AbstractTexture::parameterImplementationDSA; - parameterfvImplementation = &AbstractTexture::parameterImplementationDSA; - parameterIuivImplementation = &AbstractTexture::parameterIImplementationDSA; - parameterIivImplementation = &AbstractTexture::parameterIImplementationDSA; - getLevelParameterivImplementation = &AbstractTexture::getLevelParameterImplementationDSA; - mipmapImplementation = &AbstractTexture::mipmapImplementationDSA; - getImageImplementation = &AbstractTexture::getImageImplementationDSA; - image1DImplementation = &AbstractTexture::imageImplementationDSA; - image2DImplementation = &AbstractTexture::imageImplementationDSA; - image3DImplementation = &AbstractTexture::imageImplementationDSA; - subImage1DImplementation = &AbstractTexture::subImageImplementationDSA; - subImage2DImplementation = &AbstractTexture::subImageImplementationDSA; - subImage3DImplementation = &AbstractTexture::subImageImplementationDSA; - - setBufferImplementation = &BufferTexture::setBufferImplementationDSA; - setBufferRangeImplementation = &BufferTexture::setBufferRangeImplementationDSA; + parameteriImplementation = &AbstractTexture::parameterImplementationDSAEXT; + parameterfImplementation = &AbstractTexture::parameterImplementationDSAEXT; + parameterivImplementation = &AbstractTexture::parameterImplementationDSAEXT; + parameterfvImplementation = &AbstractTexture::parameterImplementationDSAEXT; + parameterIuivImplementation = &AbstractTexture::parameterIImplementationDSAEXT; + parameterIivImplementation = &AbstractTexture::parameterIImplementationDSAEXT; + getLevelParameterivImplementation = &AbstractTexture::getLevelParameterImplementationDSAEXT; + mipmapImplementation = &AbstractTexture::mipmapImplementationDSAEXT; + getImageImplementation = &AbstractTexture::getImageImplementationDSAEXT; + image1DImplementation = &AbstractTexture::imageImplementationDSAEXT; + image2DImplementation = &AbstractTexture::imageImplementationDSAEXT; + image3DImplementation = &AbstractTexture::imageImplementationDSAEXT; + subImage1DImplementation = &AbstractTexture::subImageImplementationDSAEXT; + subImage2DImplementation = &AbstractTexture::subImageImplementationDSAEXT; + subImage3DImplementation = &AbstractTexture::subImageImplementationDSAEXT; + + setBufferImplementation = &BufferTexture::setBufferImplementationDSAEXT; + setBufferRangeImplementation = &BufferTexture::setBufferRangeImplementationDSAEXT; } else #endif { @@ -178,9 +178,9 @@ TextureState::TextureState(Context& context, std::vector& extension #ifndef MAGNUM_TARGET_GLES if(context.isExtensionSupported()) { - storage1DImplementation = &AbstractTexture::storageImplementationDSA; - storage2DImplementation = &AbstractTexture::storageImplementationDSA; - storage3DImplementation = &AbstractTexture::storageImplementationDSA; + storage1DImplementation = &AbstractTexture::storageImplementationDSAEXT; + storage2DImplementation = &AbstractTexture::storageImplementationDSAEXT; + storage3DImplementation = &AbstractTexture::storageImplementationDSAEXT; } else #endif { @@ -208,8 +208,8 @@ TextureState::TextureState(Context& context, std::vector& extension extensions.push_back(Extensions::GL::ARB::texture_storage_multisample::string()); if(context.isExtensionSupported()) { - storage2DMultisampleImplementation = &AbstractTexture::storageMultisampleImplementationDSA; - storage3DMultisampleImplementation = &AbstractTexture::storageMultisampleImplementationDSA; + storage2DMultisampleImplementation = &AbstractTexture::storageMultisampleImplementationDSAEXT; + storage3DMultisampleImplementation = &AbstractTexture::storageMultisampleImplementationDSAEXT; } else { storage2DMultisampleImplementation = &AbstractTexture::storageMultisampleImplementationDefault; storage3DMultisampleImplementation = &AbstractTexture::storageMultisampleImplementationDefault; diff --git a/src/Magnum/Mesh.cpp b/src/Magnum/Mesh.cpp index e14d72d21..c55e01ec6 100644 --- a/src/Magnum/Mesh.cpp +++ b/src/Magnum/Mesh.cpp @@ -382,7 +382,7 @@ void Mesh::attributePointerImplementationVAO(const Attribute& attribute) { } #ifndef MAGNUM_TARGET_GLES -void Mesh::attributePointerImplementationDSA(const Attribute& attribute) { +void Mesh::attributePointerImplementationDSAEXT(const Attribute& attribute) { _created = true; glEnableVertexArrayAttribEXT(_id, attribute.location); glVertexArrayVertexAttribOffsetEXT(_id, attribute.buffer->id(), attribute.location, attribute.size, attribute.type, attribute.normalized, attribute.stride, attribute.offset); @@ -418,7 +418,7 @@ void Mesh::attributePointerImplementationVAO(const IntegerAttribute& attribute) } #ifndef MAGNUM_TARGET_GLES -void Mesh::attributePointerImplementationDSA(const IntegerAttribute& attribute) { +void Mesh::attributePointerImplementationDSAEXT(const IntegerAttribute& attribute) { _created = true; glEnableVertexArrayAttribEXT(_id, attribute.location); glVertexArrayVertexAttribIOffsetEXT(_id, attribute.buffer->id(), attribute.location, attribute.size, attribute.type, attribute.stride, attribute.offset); @@ -448,7 +448,7 @@ void Mesh::attributePointerImplementationVAO(const LongAttribute& attribute) { vertexAttribPointer(attribute); } -void Mesh::attributePointerImplementationDSA(const LongAttribute& attribute) { +void Mesh::attributePointerImplementationDSAEXT(const LongAttribute& attribute) { _created = true; glEnableVertexArrayAttribEXT(_id, attribute.location); glVertexArrayVertexAttribLOffsetEXT(_id, attribute.buffer->id(), attribute.location, attribute.size, attribute.type, attribute.stride, attribute.offset); diff --git a/src/Magnum/Mesh.h b/src/Magnum/Mesh.h index 7de09d816..072cd654c 100644 --- a/src/Magnum/Mesh.h +++ b/src/Magnum/Mesh.h @@ -962,7 +962,7 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { void MAGNUM_LOCAL attributePointerImplementationDefault(const Attribute& attribute); void MAGNUM_LOCAL attributePointerImplementationVAO(const Attribute& attribute); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL attributePointerImplementationDSA(const Attribute& attribute); + void MAGNUM_LOCAL attributePointerImplementationDSAEXT(const Attribute& attribute); #endif void MAGNUM_LOCAL vertexAttribPointer(const Attribute& attribute); @@ -971,7 +971,7 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { void MAGNUM_LOCAL attributePointerImplementationDefault(const IntegerAttribute& attribute); void MAGNUM_LOCAL attributePointerImplementationVAO(const IntegerAttribute& attribute); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL attributePointerImplementationDSA(const IntegerAttribute& attribute); + void MAGNUM_LOCAL attributePointerImplementationDSAEXT(const IntegerAttribute& attribute); #endif void MAGNUM_LOCAL vertexAttribPointer(const IntegerAttribute& attribute); #endif @@ -980,7 +980,7 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { void attributePointerInternal(const LongAttribute& attribute); void MAGNUM_LOCAL attributePointerImplementationDefault(const LongAttribute& attribute); void MAGNUM_LOCAL attributePointerImplementationVAO(const LongAttribute& attribute); - void MAGNUM_LOCAL attributePointerImplementationDSA(const LongAttribute& attribute); + void MAGNUM_LOCAL attributePointerImplementationDSAEXT(const LongAttribute& attribute); void MAGNUM_LOCAL vertexAttribPointer(const LongAttribute& attribute); #endif diff --git a/src/Magnum/Renderbuffer.cpp b/src/Magnum/Renderbuffer.cpp index 5f0292c12..580bcb162 100644 --- a/src/Magnum/Renderbuffer.cpp +++ b/src/Magnum/Renderbuffer.cpp @@ -124,7 +124,7 @@ void Renderbuffer::storageImplementationDefault(RenderbufferFormat internalForma } #ifndef MAGNUM_TARGET_GLES -void Renderbuffer::storageImplementationDSA(RenderbufferFormat internalFormat, const Vector2i& size) { +void Renderbuffer::storageImplementationDSAEXT(RenderbufferFormat internalFormat, const Vector2i& size) { _created = true; glNamedRenderbufferStorageEXT(_id, GLenum(internalFormat), size.x(), size.y()); } @@ -162,7 +162,7 @@ void Renderbuffer::storageMultisampleImplementationNV(const GLsizei samples, con #endif #ifndef MAGNUM_TARGET_GLES -void Renderbuffer::storageMultisampleImplementationDSA(GLsizei samples, RenderbufferFormat internalFormat, const Vector2i& size) { +void Renderbuffer::storageMultisampleImplementationDSAEXT(GLsizei samples, RenderbufferFormat internalFormat, const Vector2i& size) { _created = true; glNamedRenderbufferStorageMultisampleEXT(_id, samples, GLenum(internalFormat), size.x(), size.y()); } diff --git a/src/Magnum/Renderbuffer.h b/src/Magnum/Renderbuffer.h index 6764ace61..69b7021a2 100644 --- a/src/Magnum/Renderbuffer.h +++ b/src/Magnum/Renderbuffer.h @@ -184,13 +184,13 @@ class MAGNUM_EXPORT Renderbuffer: public AbstractObject { void MAGNUM_LOCAL storageImplementationDefault(RenderbufferFormat internalFormat, const Vector2i& size); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL storageImplementationDSA(RenderbufferFormat internalFormat, const Vector2i& size); + void MAGNUM_LOCAL storageImplementationDSAEXT(RenderbufferFormat internalFormat, const Vector2i& size); #endif #ifndef MAGNUM_TARGET_GLES2 void MAGNUM_LOCAL storageMultisampleImplementationDefault(GLsizei samples, RenderbufferFormat internalFormat, const Vector2i& size); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL storageMultisampleImplementationDSA(GLsizei samples, RenderbufferFormat internalFormat, const Vector2i& size); + void MAGNUM_LOCAL storageMultisampleImplementationDSAEXT(GLsizei samples, RenderbufferFormat internalFormat, const Vector2i& size); #endif #else void MAGNUM_LOCAL storageMultisampleImplementationANGLE(GLsizei samples, RenderbufferFormat internalFormat, const Vector2i& size);