ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1990 Commits
21 Branches
19 Tags
70 MiB
Tree: ab5b6fcbb3
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ab5b6fcbb3'
${ noResults }
magnum/src/AbstractFramebuffer.cpp

293 lines
12 KiB
Raw Normal View History Unescape

Split Framebuffer into default and named framebuffers. Default framebuffer is now accessible throught defaultFramebuffer global variable, named framebuffers are handled the same way as before. All operations (clear, setViewport, blit, read) now are member functions so they cannot be mistakenly used when unwanted framebuffer is bound. Further rework (DSA, state tracking...) is on the way.
14 years ago
/*
This file is part of Magnum.
Relicensing to MIT/Expat license, part 3: source files. Added license header also to shader sources. Hopefully it won't harm compilation times too much.
13 years ago
Copyright © 2010, 2011, 2012, 2013 Vladimír Vondruš <mosra@centrum.cz>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
Split Framebuffer into default and named framebuffers. Default framebuffer is now accessible throught defaultFramebuffer global variable, named framebuffers are handled the same way as before. All operations (clear, setViewport, blit, read) now are member functions so they cannot be mistakenly used when unwanted framebuffer is bound. Further rework (DSA, state tracking...) is on the way.
14 years ago
*/
#include "AbstractFramebuffer.h"
#include "BufferImage.h"
Using old framebuffer binding internally if new is not supported.
14 years ago
#include "Context.h"
#include "Extensions.h"
Split Framebuffer into default and named framebuffers. Default framebuffer is now accessible throught defaultFramebuffer global variable, named framebuffers are handled the same way as before. All operations (clear, setViewport, blit, read) now are member functions so they cannot be mistakenly used when unwanted framebuffer is bound. Further rework (DSA, state tracking...) is on the way.
14 years ago
#include "Image.h"
Tracking framebuffer binding.
14 years ago
#include "Implementation/FramebufferState.h"
#include "Implementation/State.h"
Split Framebuffer into default and named framebuffers. Default framebuffer is now accessible throught defaultFramebuffer global variable, named framebuffers are handled the same way as before. All operations (clear, setViewport, blit, read) now are member functions so they cannot be mistakenly used when unwanted framebuffer is bound. Further rework (DSA, state tracking...) is on the way.
14 years ago
namespace Magnum {
Support for ARB_robustness. Robust *Framebuffer::read() access, ability to query robust buffer access behavior in Context::flags(), ability to check graphics reset status and reset notification policy in Renderer.
13 years ago
AbstractFramebuffer::ReadImplementation AbstractFramebuffer::readImplementation = &AbstractFramebuffer::readImplementationDefault;
Using EXT_direct_state_access in framebuffers. Framebuffer::attach*() doesn't need the target at all (meaning the attachment will be used for both reading and drawing), another misunderstanding on my side. Now the extension is used on all places where it can be used (except for unimplemented features).
14 years ago
AbstractFramebuffer::DrawBuffersImplementation AbstractFramebuffer::drawBuffersImplementation = &AbstractFramebuffer::drawBuffersImplementationDefault;
AbstractFramebuffer::DrawBufferImplementation AbstractFramebuffer::drawBufferImplementation = &AbstractFramebuffer::drawBufferImplementationDefault;
AbstractFramebuffer::ReadBufferImplementation AbstractFramebuffer::readBufferImplementation = &AbstractFramebuffer::readBufferImplementationDefault;
Using old framebuffer binding internally if new is not supported.
14 years ago
AbstractFramebuffer::Target AbstractFramebuffer::readTarget = AbstractFramebuffer::Target::ReadDraw;
AbstractFramebuffer::Target AbstractFramebuffer::drawTarget = AbstractFramebuffer::Target::ReadDraw;
Tracking framebuffer binding.
14 years ago
void AbstractFramebuffer::bind(Target target) {
Tracking viewport state in Framebuffer. Viewport position and size is managed separately for each framebuffer and glViewport() is called in bind() (and also from setViewport(), if the framebuffer is currently bound) if the viewport differs from current state. If used only one framebuffer size through whole application lifetime, glViewport() doesn't need to be called at all.
14 years ago
bindInternal(target);
setViewportInternal();
}
void AbstractFramebuffer::bindInternal(Target target) {
Tracking framebuffer binding.
14 years ago
Implementation::FramebufferState* state = Context::current()->state()->framebuffer;
/* If already bound, done, otherwise update tracked state */
if(target == Target::Read) {
if(state->readBinding == _id) return;
state->readBinding = _id;
} else if(target == Target::Draw) {
if(state->drawBinding == _id) return;
state->drawBinding = _id;
} else if(target == Target::ReadDraw) {
if(state->readBinding == _id && state->drawBinding == _id) return;
state->readBinding = state->drawBinding = _id;
Using CORRADE_ASSERT_UNREACHABLE() instead of CORRADE_ASSERT(false).
13 years ago
} else CORRADE_ASSERT_UNREACHABLE();
Tracking framebuffer binding.
14 years ago
glBindFramebuffer(static_cast<GLenum>(target), _id);
}
Reuse any binding (not just draw) when adding framebuffer attachments.
14 years ago
AbstractFramebuffer::Target AbstractFramebuffer::bindInternal() {
Implementation::FramebufferState* state = Context::current()->state()->framebuffer;
/* Return target to which the framebuffer is already bound */
if(state->readBinding == _id && state->drawBinding == _id)
return Target::ReadDraw;
if(state->readBinding == _id)
return Target::Read;
if(state->drawBinding == _id)
return Target::Draw;
/* Or bind it, if not already */
state->readBinding = _id;
if(readTarget == Target::ReadDraw) state->drawBinding = _id;
glBindFramebuffer(GLenum(readTarget), _id);
return readTarget;
}
Tracking viewport state in Framebuffer. Viewport position and size is managed separately for each framebuffer and glViewport() is called in bind() (and also from setViewport(), if the framebuffer is currently bound) if the viewport differs from current state. If used only one framebuffer size through whole application lifetime, glViewport() doesn't need to be called at all.
14 years ago
Using Rectangle in framebuffer.
14 years ago
void AbstractFramebuffer::blit(AbstractFramebuffer& source, AbstractFramebuffer& destination, const Rectanglei& sourceRectangle, const Rectanglei& destinationRectangle, AbstractFramebuffer::BlitMask mask, AbstractFramebuffer::BlitFilter filter) {
Tracking viewport state in Framebuffer. Viewport position and size is managed separately for each framebuffer and glViewport() is called in bind() (and also from setViewport(), if the framebuffer is currently bound) if the viewport differs from current state. If used only one framebuffer size through whole application lifetime, glViewport() doesn't need to be called at all.
14 years ago
source.bindInternal(AbstractFramebuffer::Target::Read);
destination.bindInternal(AbstractFramebuffer::Target::Draw);
/** @todo Get some extension wrangler instead to avoid undeclared glBlitFramebuffer() on ES2 */
#ifndef MAGNUM_TARGET_GLES2
Using Rectangle in framebuffer.
14 years ago
glBlitFramebuffer(sourceRectangle.left(), sourceRectangle.bottom(), sourceRectangle.right(), sourceRectangle.top(), destinationRectangle.left(), destinationRectangle.bottom(), destinationRectangle.right(), destinationRectangle.top(), static_cast<GLbitfield>(mask), static_cast<GLenum>(filter));
Tracking viewport state in Framebuffer. Viewport position and size is managed separately for each framebuffer and glViewport() is called in bind() (and also from setViewport(), if the framebuffer is currently bound) if the viewport differs from current state. If used only one framebuffer size through whole application lifetime, glViewport() doesn't need to be called at all.
14 years ago
#else
Using Rectangle in framebuffer.
14 years ago
static_cast<void>(sourceRectangle);
static_cast<void>(destinationRectangle);
Tracking viewport state in Framebuffer. Viewport position and size is managed separately for each framebuffer and glViewport() is called in bind() (and also from setViewport(), if the framebuffer is currently bound) if the viewport differs from current state. If used only one framebuffer size through whole application lifetime, glViewport() doesn't need to be called at all.
14 years ago
static_cast<void>(mask);
static_cast<void>(filter);
#endif
}
Added missing method chaining to framebuffer configuration functions.
13 years ago
AbstractFramebuffer* AbstractFramebuffer::setViewport(const Rectanglei& rectangle) {
Using Rectangle in framebuffer.
14 years ago
_viewport = rectangle;
Tracking viewport state in Framebuffer. Viewport position and size is managed separately for each framebuffer and glViewport() is called in bind() (and also from setViewport(), if the framebuffer is currently bound) if the viewport differs from current state. If used only one framebuffer size through whole application lifetime, glViewport() doesn't need to be called at all.
14 years ago
/* Update the viewport if the framebuffer is currently bound */
if(Context::current()->state()->framebuffer->drawBinding == _id)
setViewportInternal();
Added missing method chaining to framebuffer configuration functions.
13 years ago
return this;
Tracking viewport state in Framebuffer. Viewport position and size is managed separately for each framebuffer and glViewport() is called in bind() (and also from setViewport(), if the framebuffer is currently bound) if the viewport differs from current state. If used only one framebuffer size through whole application lifetime, glViewport() doesn't need to be called at all.
14 years ago
}
void AbstractFramebuffer::setViewportInternal() {
Implementation::FramebufferState* state = Context::current()->state()->framebuffer;
CORRADE_INTERNAL_ASSERT(state->drawBinding == _id);
/* Already up-to-date, nothing to do */
Using Rectangle in framebuffer.
14 years ago
if(state->viewport == _viewport)
Tracking viewport state in Framebuffer. Viewport position and size is managed separately for each framebuffer and glViewport() is called in bind() (and also from setViewport(), if the framebuffer is currently bound) if the viewport differs from current state. If used only one framebuffer size through whole application lifetime, glViewport() doesn't need to be called at all.
14 years ago
return;
/* Update the state and viewport */
Using Rectangle in framebuffer.
14 years ago
state->viewport = _viewport;
glViewport(_viewport.left(), _viewport.bottom(), _viewport.width(), _viewport.height());
Tracking viewport state in Framebuffer. Viewport position and size is managed separately for each framebuffer and glViewport() is called in bind() (and also from setViewport(), if the framebuffer is currently bound) if the viewport differs from current state. If used only one framebuffer size through whole application lifetime, glViewport() doesn't need to be called at all.
14 years ago
}
void AbstractFramebuffer::clear(ClearMask mask) {
bindInternal(drawTarget);
glClear(static_cast<GLbitfield>(mask));
}
Tracking framebuffer binding.
14 years ago
Reading parameters from image in *Framebuffer::read(). There will be more parameters like row length etc. which would need to be passed too. This function now expects properly formatted empty image which it fills with data.
13 years ago
void AbstractFramebuffer::read(const Vector2i& offset, const Vector2i& size, Image2D* image) {
Tracking viewport state in Framebuffer. Viewport position and size is managed separately for each framebuffer and glViewport() is called in bind() (and also from setViewport(), if the framebuffer is currently bound) if the viewport differs from current state. If used only one framebuffer size through whole application lifetime, glViewport() doesn't need to be called at all.
14 years ago
bindInternal(readTarget);
Reading parameters from image in *Framebuffer::read(). There will be more parameters like row length etc. which would need to be passed too. This function now expects properly formatted empty image which it fills with data.
13 years ago
const std::size_t dataSize = image->pixelSize()*size.product();
Support for ARB_robustness. Robust *Framebuffer::read() access, ability to query robust buffer access behavior in Context::flags(), ability to check graphics reset status and reset notification policy in Renderer.
13 years ago
char* const data = new char[dataSize];
Reading parameters from image in *Framebuffer::read(). There will be more parameters like row length etc. which would need to be passed too. This function now expects properly formatted empty image which it fills with data.
13 years ago
readImplementation(offset, size, image->format(), image->type(), dataSize, data);
image->setData(size, image->format(), image->type(), data);
Split Framebuffer into default and named framebuffers. Default framebuffer is now accessible throught defaultFramebuffer global variable, named framebuffers are handled the same way as before. All operations (clear, setViewport, blit, read) now are member functions so they cannot be mistakenly used when unwanted framebuffer is bound. Further rework (DSA, state tracking...) is on the way.
14 years ago
}
#ifndef MAGNUM_TARGET_GLES2
Reading parameters from image in *Framebuffer::read(). There will be more parameters like row length etc. which would need to be passed too. This function now expects properly formatted empty image which it fills with data.
13 years ago
void AbstractFramebuffer::read(const Vector2i& offset, const Vector2i& size, BufferImage2D* image, Buffer::Usage usage) {
Tracking viewport state in Framebuffer. Viewport position and size is managed separately for each framebuffer and glViewport() is called in bind() (and also from setViewport(), if the framebuffer is currently bound) if the viewport differs from current state. If used only one framebuffer size through whole application lifetime, glViewport() doesn't need to be called at all.
14 years ago
bindInternal(readTarget);
Split Framebuffer into default and named framebuffers. Default framebuffer is now accessible throught defaultFramebuffer global variable, named framebuffers are handled the same way as before. All operations (clear, setViewport, blit, read) now are member functions so they cannot be mistakenly used when unwanted framebuffer is bound. Further rework (DSA, state tracking...) is on the way.
14 years ago
/* If the buffer doesn't have sufficient size, resize it */
/** @todo Explicitly reset also when buffer usage changes */
Reading parameters from image in *Framebuffer::read(). There will be more parameters like row length etc. which would need to be passed too. This function now expects properly formatted empty image which it fills with data.
13 years ago
if(image->size() != size)
image->setData(size, image->format(), image->type(), nullptr, usage);
Split Framebuffer into default and named framebuffers. Default framebuffer is now accessible throught defaultFramebuffer global variable, named framebuffers are handled the same way as before. All operations (clear, setViewport, blit, read) now are member functions so they cannot be mistakenly used when unwanted framebuffer is bound. Further rework (DSA, state tracking...) is on the way.
14 years ago
image->buffer()->bind(Buffer::Target::PixelPack);
Support for ARB_robustness. Robust *Framebuffer::read() access, ability to query robust buffer access behavior in Context::flags(), ability to check graphics reset status and reset notification policy in Renderer.
13 years ago
/** @todo De-duplicate buffer size computation */
Reading parameters from image in *Framebuffer::read(). There will be more parameters like row length etc. which would need to be passed too. This function now expects properly formatted empty image which it fills with data.
13 years ago
readImplementation(offset, size, image->format(), image->type(), image->pixelSize()*size.product(), nullptr);
Split Framebuffer into default and named framebuffers. Default framebuffer is now accessible throught defaultFramebuffer global variable, named framebuffers are handled the same way as before. All operations (clear, setViewport, blit, read) now are member functions so they cannot be mistakenly used when unwanted framebuffer is bound. Further rework (DSA, state tracking...) is on the way.
14 years ago
}
#endif
Implemented ARB_invalidate_subdata GL 4.3 extension. Framebuffer invalidation is also available in OpenGL ES 3.0 and ES 2.0 using EXT_discard_framebuffer extension.
14 years ago
void AbstractFramebuffer::invalidateImplementation(GLsizei count, GLenum* attachments) {
/** @todo Re-enable when extension wrangler is available for ES2 */
#ifndef MAGNUM_TARGET_GLES2
glInvalidateFramebuffer(GLenum(bindInternal()), count, attachments);
#else
//glDiscardFramebufferEXT(GLenum(bindInternal()), count, attachments);
Fixed compiler warnings.
14 years ago
static_cast<void>(count);
static_cast<void>(attachments);
Implemented ARB_invalidate_subdata GL 4.3 extension. Framebuffer invalidation is also available in OpenGL ES 3.0 and ES 2.0 using EXT_discard_framebuffer extension.
14 years ago
#endif
}
void AbstractFramebuffer::invalidateImplementation(GLsizei count, GLenum* attachments, const Rectanglei& rectangle) {
/** @todo Re-enable when extension wrangler is available for ES2 */
#ifndef MAGNUM_TARGET_GLES2
glInvalidateSubFramebuffer(GLenum(bindInternal()), count, attachments, rectangle.left(), rectangle.bottom(), rectangle.width(), rectangle.height());
#else
//glDiscardSubFramebufferEXT(GLenum(bindInternal()), count, attachments, rectangle.left(), rectangle.bottom(), rectangle.width(), rectangle.height());
Fixed compiler warnings.
14 years ago
static_cast<void>(count);
static_cast<void>(attachments);
Implemented ARB_invalidate_subdata GL 4.3 extension. Framebuffer invalidation is also available in OpenGL ES 3.0 and ES 2.0 using EXT_discard_framebuffer extension.
14 years ago
static_cast<void>(rectangle);
#endif
}
Using old framebuffer binding internally if new is not supported.
14 years ago
void AbstractFramebuffer::initializeContextBasedFunctionality(Context* context) {
#ifndef MAGNUM_TARGET_GLES
if(context->isExtensionSupported<Extensions::GL::EXT::framebuffer_blit>()) {
Debug() << "AbstractFramebuffer: using" << Extensions::GL::EXT::framebuffer_blit::string() << "features";
readTarget = Target::Read;
drawTarget = Target::Draw;
}
Using EXT_direct_state_access in framebuffers. Framebuffer::attach*() doesn't need the target at all (meaning the attachment will be used for both reading and drawing), another misunderstanding on my side. Now the extension is used on all places where it can be used (except for unimplemented features).
14 years ago
if(context->isExtensionSupported<Extensions::GL::EXT::direct_state_access>()) {
Debug() << "AbstractFramebuffer: using" << Extensions::GL::EXT::direct_state_access::string() << "features";
drawBuffersImplementation = &AbstractFramebuffer::drawBuffersImplementationDSA;
drawBufferImplementation = &AbstractFramebuffer::drawBufferImplementationDSA;
readBufferImplementation = &AbstractFramebuffer::readBufferImplementationDSA;
}
Support for ARB_robustness. Robust *Framebuffer::read() access, ability to query robust buffer access behavior in Context::flags(), ability to check graphics reset status and reset notification policy in Renderer.
13 years ago
#endif
#ifndef MAGNUM_TARGET_GLES3
#ifndef MAGNUM_TARGET_GLES
if(context->isExtensionSupported<Extensions::GL::ARB::robustness>())
#else
if(context->isExtensionSupported<Extensions::GL::EXT::robustness>())
#endif
{
#ifndef MAGNUM_TARGET_GLES
Debug() << "AbstractFramebuffer: using" << Extensions::GL::ARB::robustness::string() << "features";
#else
//Debug() << "AbstractFramebuffer: using" << Extensions::GL::EXT::robustness::string() << "features";
#endif
/** @todo Enable when extension wrangler for ES is available */
#ifndef MAGNUM_TARGET_GLES
readImplementation = &AbstractFramebuffer::readImplementationRobustness;
#endif
}
Using old framebuffer binding internally if new is not supported.
14 years ago
#else
static_cast<void>(context);
#endif
}
Using EXT_direct_state_access in framebuffers. Framebuffer::attach*() doesn't need the target at all (meaning the attachment will be used for both reading and drawing), another misunderstanding on my side. Now the extension is used on all places where it can be used (except for unimplemented features).
14 years ago
void AbstractFramebuffer::drawBuffersImplementationDefault(GLsizei count, const GLenum* buffers) {
/** @todo Re-enable when extension wrangler is available for ES2 */
#ifndef MAGNUM_TARGET_GLES2
bindInternal(drawTarget);
glDrawBuffers(count, buffers);
#else
static_cast<void>(count);
static_cast<void>(buffers);
#endif
}
#ifndef MAGNUM_TARGET_GLES
void AbstractFramebuffer::drawBuffersImplementationDSA(GLsizei count, const GLenum* buffers) {
glFramebufferDrawBuffersEXT(_id, count, buffers);
}
#endif
void AbstractFramebuffer::drawBufferImplementationDefault(GLenum buffer) {
/** @todo Re-enable when extension wrangler is available for ES2 */
#ifndef MAGNUM_TARGET_GLES2
bindInternal(drawTarget);
glDrawBuffer() is not available in ES3. Using glDrawBuffers() also in this case.
13 years ago
#ifndef MAGNUM_TARGET_GLES3
Using EXT_direct_state_access in framebuffers. Framebuffer::attach*() doesn't need the target at all (meaning the attachment will be used for both reading and drawing), another misunderstanding on my side. Now the extension is used on all places where it can be used (except for unimplemented features).
14 years ago
glDrawBuffer(buffer);
#else
glDrawBuffer() is not available in ES3. Using glDrawBuffers() also in this case.
13 years ago
glDrawBuffers(1, &buffer);
#endif
#else
Using EXT_direct_state_access in framebuffers. Framebuffer::attach*() doesn't need the target at all (meaning the attachment will be used for both reading and drawing), another misunderstanding on my side. Now the extension is used on all places where it can be used (except for unimplemented features).
14 years ago
static_cast<void>(buffer);
#endif
}
#ifndef MAGNUM_TARGET_GLES
void AbstractFramebuffer::drawBufferImplementationDSA(GLenum buffer) {
glFramebufferDrawBufferEXT(_id, buffer);
}
#endif
void AbstractFramebuffer::readBufferImplementationDefault(GLenum buffer) {
/** @todo Get some extension wrangler instead to avoid undeclared glReadBuffer() on ES2 */
#ifndef MAGNUM_TARGET_GLES2
bindInternal(readTarget);
glReadBuffer(buffer);
#else
static_cast<void>(buffer);
#endif
}
#ifndef MAGNUM_TARGET_GLES
void AbstractFramebuffer::readBufferImplementationDSA(GLenum buffer) {
glFramebufferReadBufferEXT(_id, buffer);
}
#endif
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
void AbstractFramebuffer::readImplementationDefault(const Vector2i& offset, const Vector2i& size, const ImageFormat format, const ImageType type, const std::size_t, GLvoid* const data) {
Support for ARB_robustness. Robust *Framebuffer::read() access, ability to query robust buffer access behavior in Context::flags(), ability to check graphics reset status and reset notification policy in Renderer.
13 years ago
glReadPixels(offset.x(), offset.y(), size.x(), size.y(), static_cast<GLenum>(format), static_cast<GLenum>(type), data);
}
#ifndef MAGNUM_TARGET_GLES3
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
void AbstractFramebuffer::readImplementationRobustness(const Vector2i& offset, const Vector2i& size, const ImageFormat format, const ImageType type, const std::size_t dataSize, GLvoid* const data) {
Support for ARB_robustness. Robust *Framebuffer::read() access, ability to query robust buffer access behavior in Context::flags(), ability to check graphics reset status and reset notification policy in Renderer.
13 years ago
/** @todo Enable when extension wrangler for ES is available */
#ifndef MAGNUM_TARGET_GLES
glReadnPixelsARB(offset.x(), offset.y(), size.x(), size.y(), static_cast<GLenum>(format), static_cast<GLenum>(type), dataSize, data);
#else
CORRADE_INTERNAL_ASSERT(false);
//glReadnPixelsEXT(offset.x(), offset.y(), size.x(), size.y(), static_cast<GLenum>(format), static_cast<GLenum>(type), data);
static_cast<void>(offset);
static_cast<void>(size);
static_cast<void>(format);
static_cast<void>(type);
static_cast<void>(dataSize);
static_cast<void>(data);
#endif
}
#endif
Split Framebuffer into default and named framebuffers. Default framebuffer is now accessible throught defaultFramebuffer global variable, named framebuffers are handled the same way as before. All operations (clear, setViewport, blit, read) now are member functions so they cannot be mistakenly used when unwanted framebuffer is bound. Further rework (DSA, state tracking...) is on the way.
14 years ago
}