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.
5830 Commits
21 Branches
19 Tags
70 MiB
Tree: 9e58eaca61
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '9e58eaca61'
${ noResults }
magnum/src/Magnum/GL/Implementation/FramebufferState.cpp

359 lines
17 KiB
Raw Normal View History Unescape

Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
/*
This file is part of Magnum.
Updated copyright year.
8 years ago
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
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.
*/
#include "FramebufferState.h"
Split the OpenGL layer out, pt 1: moving files to a new location. Minimal updates (just the include guards) so Git is hopefully able to detect the rename and track the history properly. Everything except Magnum::GL doesn't compile now.
8 years ago
#include "Magnum/GL/Context.h"
#include "Magnum/GL/Extensions.h"
#include "Magnum/GL/Renderbuffer.h"
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
Ability to reset internal state tracker.
12 years ago
#include "State.h"
Split the OpenGL layer out, pt 4: new Magnum::GL namespace. At the moment just the GL library itself w/o the tests, and without backwards compatibility aliases. The following types were left in the root namespace, despite being in the GL/ directory, as they will get moved back soon: * Image, CompressedImage and their dimensional typedefs * ImageView, CompressedImageView and their dimensional typedefs * PixelStorage Not PixelFormat etc., that one will stay in the GL namespace and a completely new PixelFormat enum will be provided in the root namespace.
8 years ago
namespace Magnum { namespace GL { namespace Implementation {
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
Parametrize disengaged viewport instead of using default-constructed value.
11 years ago
constexpr const Range2Di FramebufferState::DisengagedViewport;
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
FramebufferState::FramebufferState(Context& context, std::vector<std::string>& extensions): readBinding{0}, drawBinding{0}, renderbufferBinding{0}, maxDrawBuffers{0}, maxColorAttachments{0}, maxRenderbufferSize{0},
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
maxSamples{0},
#endif
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
#ifndef MAGNUM_TARGET_GLES
Parametrize disengaged viewport instead of using default-constructed value.
11 years ago
maxDualSourceDrawBuffers{0},
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
#endif
Parametrize disengaged viewport instead of using default-constructed value.
11 years ago
viewport{DisengagedViewport}
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
{
ARB_direct_state_access support for creating framebuffers.
12 years ago
/* Create implementation */
#ifndef MAGNUM_TARGET_GLES
if(context.isExtensionSupported<Extensions::GL::ARB::direct_state_access>()) {
push_back -> emplace_back
9 years ago
extensions.emplace_back(Extensions::GL::ARB::direct_state_access::string());
ARB_direct_state_access support for creating framebuffers.
12 years ago
createImplementation = &Framebuffer::createImplementationDSA;
ARB_direct_state_access support for creating renderbuffers.
12 years ago
createRenderbufferImplementation = &Renderbuffer::createImplementationDSA;
ARB_direct_state_access support for creating framebuffers.
12 years ago
} else
#endif
{
createImplementation = &Framebuffer::createImplementationDefault;
ARB_direct_state_access support for creating renderbuffers.
12 years ago
createRenderbufferImplementation = &Renderbuffer::createImplementationDefault;
ARB_direct_state_access support for creating framebuffers.
12 years ago
}
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
/* DSA/non-DSA implementation */
#ifndef MAGNUM_TARGET_GLES
Full ARB_direct_state_access support in framebuffers. In comparison to EXT_DSA, ARB_DSA also knows how to blit and invalidate without binding, yay!
12 years ago
if(context.isExtensionSupported<Extensions::GL::ARB::direct_state_access>()) {
/* Extension added above */
checkStatusImplementation = &AbstractFramebuffer::checkStatusImplementationDSA;
Implemented glClearBuffer() APIs from GL 3.0 / GLES 3.0. According to my browser, glClear() can't be used to clear integer framebuffers, so this APIs are needed.
9 years ago
clearIImplementation = &AbstractFramebuffer::clearImplementationDSA;
clearUIImplementation = &AbstractFramebuffer::clearImplementationDSA;
clearFImplementation = &AbstractFramebuffer::clearImplementationDSA;
clearFIImplementation = &AbstractFramebuffer::clearImplementationDSA;
Full ARB_direct_state_access support in framebuffers. In comparison to EXT_DSA, ARB_DSA also knows how to blit and invalidate without binding, yay!
12 years ago
drawBuffersImplementation = &AbstractFramebuffer::drawBuffersImplementationDSA;
drawBufferImplementation = &AbstractFramebuffer::drawBufferImplementationDSA;
readBufferImplementation = &AbstractFramebuffer::readBufferImplementationDSA;
Implemented *Framebuffer::copyImage() and copySubImage(). Default, ARB_DSA and EXT_DSA paths.
10 years ago
copySub1DImplementation = &AbstractFramebuffer::copySub1DImplementationDSA;
copySub2DImplementation = &AbstractFramebuffer::copySub2DImplementationDSA;
copySubCubeMapImplementation = &AbstractFramebuffer::copySubCubeMapImplementationDSA;
copySub3DImplementation = &AbstractFramebuffer::copySub3DImplementationDSA;
Full ARB_direct_state_access support in framebuffers. In comparison to EXT_DSA, ARB_DSA also knows how to blit and invalidate without binding, yay!
12 years ago
renderbufferImplementation = &Framebuffer::renderbufferImplementationDSA;
Support for layered texture attachments in Framebuffer. I.e. rendering to a layer addressed by `gl_Layer` in geometry shader.
11 years ago
/* The 1D implementation uses the same function as the layered attachment */
texture1DImplementation = &Framebuffer::textureImplementationDSA;
Fix Framebuffer::attachCubeMapTexture() behaving as a layered attachment. The DSA function does not accept any texture target parameter so the cube map texture was bound as a whole (and thus behaving as a layered attachment) instead of just a single face. Thanks to @chpatrick for the report.
11 years ago
/* DSA doesn't have texture target parameter so we need to use different
function to specify cube map face */
Full ARB_direct_state_access support in framebuffers. In comparison to EXT_DSA, ARB_DSA also knows how to blit and invalidate without binding, yay!
12 years ago
texture2DImplementation = &Framebuffer::texture2DImplementationDSA;
Support for layered texture attachments in Framebuffer. I.e. rendering to a layer addressed by `gl_Layer` in geometry shader.
11 years ago
textureImplementation = &Framebuffer::textureImplementationDSA;
Fix Framebuffer::attachCubeMapTexture() behaving as a layered attachment. The DSA function does not accept any texture target parameter so the cube map texture was bound as a whole (and thus behaving as a layered attachment) instead of just a single face. Thanks to @chpatrick for the report.
11 years ago
textureCubeMapImplementation = &Framebuffer::textureCubeMapImplementationDSA;
Full ARB_direct_state_access support in framebuffers. In comparison to EXT_DSA, ARB_DSA also knows how to blit and invalidate without binding, yay!
12 years ago
textureLayerImplementation = &Framebuffer::textureLayerImplementationDSA;
renderbufferStorageImplementation = &Renderbuffer::storageImplementationDSA;
} else if(context.isExtensionSupported<Extensions::GL::EXT::direct_state_access>()) {
push_back -> emplace_back
9 years ago
extensions.emplace_back(Extensions::GL::EXT::direct_state_access::string());
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
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.
12 years ago
checkStatusImplementation = &AbstractFramebuffer::checkStatusImplementationDSAEXT;
Implemented glClearBuffer() APIs from GL 3.0 / GLES 3.0. According to my browser, glClear() can't be used to clear integer framebuffers, so this APIs are needed.
9 years ago
/* I don't bother with EXT_DSA anymore */
clearIImplementation = &AbstractFramebuffer::clearImplementationDefault;
clearUIImplementation = &AbstractFramebuffer::clearImplementationDefault;
clearFImplementation = &AbstractFramebuffer::clearImplementationDefault;
clearFIImplementation = &AbstractFramebuffer::clearImplementationDefault;
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.
12 years ago
drawBuffersImplementation = &AbstractFramebuffer::drawBuffersImplementationDSAEXT;
drawBufferImplementation = &AbstractFramebuffer::drawBufferImplementationDSAEXT;
readBufferImplementation = &AbstractFramebuffer::readBufferImplementationDSAEXT;
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
Implemented *Framebuffer::copyImage() and copySubImage(). Default, ARB_DSA and EXT_DSA paths.
10 years ago
copySub1DImplementation = &AbstractFramebuffer::copySub1DImplementationDSAEXT;
copySub2DImplementation = &AbstractFramebuffer::copySub2DImplementationDSAEXT;
copySubCubeMapImplementation = &AbstractFramebuffer::copySub2DImplementationDSAEXT;
copySub3DImplementation = &AbstractFramebuffer::copySub3DImplementationDSAEXT;
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.
12 years ago
renderbufferImplementation = &Framebuffer::renderbufferImplementationDSAEXT;
texture1DImplementation = &Framebuffer::texture1DImplementationDSAEXT;
Fix Framebuffer::attachCubeMapTexture() behaving as a layered attachment. The DSA function does not accept any texture target parameter so the cube map texture was bound as a whole (and thus behaving as a layered attachment) instead of just a single face. Thanks to @chpatrick for the report.
11 years ago
/* The EXT_DSA implementation is the same for both 2D and cube map textures */
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.
12 years ago
texture2DImplementation = &Framebuffer::texture2DImplementationDSAEXT;
Support for layered texture attachments in Framebuffer. I.e. rendering to a layer addressed by `gl_Layer` in geometry shader.
11 years ago
textureImplementation = &Framebuffer::textureImplementationDSAEXT;
Fix Framebuffer::attachCubeMapTexture() behaving as a layered attachment. The DSA function does not accept any texture target parameter so the cube map texture was bound as a whole (and thus behaving as a layered attachment) instead of just a single face. Thanks to @chpatrick for the report.
11 years ago
textureCubeMapImplementation = &Framebuffer::texture2DImplementationDSAEXT;
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.
12 years ago
textureLayerImplementation = &Framebuffer::textureLayerImplementationDSAEXT;
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
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.
12 years ago
renderbufferStorageImplementation = &Renderbuffer::storageImplementationDSAEXT;
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
} else
#endif
{
checkStatusImplementation = &AbstractFramebuffer::checkStatusImplementationDefault;
Implemented glClearBuffer() APIs from GL 3.0 / GLES 3.0. According to my browser, glClear() can't be used to clear integer framebuffers, so this APIs are needed.
9 years ago
#ifndef MAGNUM_TARGET_GLES2
clearIImplementation = &AbstractFramebuffer::clearImplementationDefault;
clearUIImplementation = &AbstractFramebuffer::clearImplementationDefault;
clearFImplementation = &AbstractFramebuffer::clearImplementationDefault;
clearFIImplementation = &AbstractFramebuffer::clearImplementationDefault;
#endif
Clarified and updated *Framebuffer::mapForDraw() implementations. In OpenGL ES 2.0 there is EXT_draw_buffers, which I overlooked somehow, so I added it to extension list and included in the implementation. It combines NV_draw_buffers and NV_fbo_color_attachments, so the implementation now selects one of the two based on which extension is supported, preferring the EXT one. Updated the documentation to be less confusing, fixed extension links. Also the single-output mapForDraw() is not handled separately on ES anymore and just calls DrawBuffers implementation with single parameter, resulting in less generated code. EXT_draw_buffers can also be called on default framebuffer and apparently in ES there is no way to map front framebuffer for drawing, so I removed it from the DefaultFramebuffer::DrawAttachment enum.
11 years ago
#ifndef MAGNUM_TARGET_GLES2
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
drawBuffersImplementation = &AbstractFramebuffer::drawBuffersImplementationDefault;
Clarified and updated *Framebuffer::mapForDraw() implementations. In OpenGL ES 2.0 there is EXT_draw_buffers, which I overlooked somehow, so I added it to extension list and included in the implementation. It combines NV_draw_buffers and NV_fbo_color_attachments, so the implementation now selects one of the two based on which extension is supported, preferring the EXT one. Updated the documentation to be less confusing, fixed extension links. Also the single-output mapForDraw() is not handled separately on ES anymore and just calls DrawBuffers implementation with single parameter, resulting in less generated code. EXT_draw_buffers can also be called on default framebuffer and apparently in ES there is no way to map front framebuffer for drawing, so I removed it from the DefaultFramebuffer::DrawAttachment enum.
11 years ago
#endif
#ifndef MAGNUM_TARGET_GLES
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
drawBufferImplementation = &AbstractFramebuffer::drawBufferImplementationDefault;
Clarified and updated *Framebuffer::mapForDraw() implementations. In OpenGL ES 2.0 there is EXT_draw_buffers, which I overlooked somehow, so I added it to extension list and included in the implementation. It combines NV_draw_buffers and NV_fbo_color_attachments, so the implementation now selects one of the two based on which extension is supported, preferring the EXT one. Updated the documentation to be less confusing, fixed extension links. Also the single-output mapForDraw() is not handled separately on ES anymore and just calls DrawBuffers implementation with single parameter, resulting in less generated code. EXT_draw_buffers can also be called on default framebuffer and apparently in ES there is no way to map front framebuffer for drawing, so I removed it from the DefaultFramebuffer::DrawAttachment enum.
11 years ago
#endif
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
readBufferImplementation = &AbstractFramebuffer::readBufferImplementationDefault;
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
#endif
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
Implemented *Framebuffer::copyImage() and copySubImage(). Default, ARB_DSA and EXT_DSA paths.
10 years ago
#ifndef MAGNUM_TARGET_GLES
copySub1DImplementation = &AbstractFramebuffer::copySub1DImplementationDefault;
#endif
copySub2DImplementation = &AbstractFramebuffer::copySub2DImplementationDefault;
copySubCubeMapImplementation = &AbstractFramebuffer::copySub2DImplementationDefault;
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
copySub3DImplementation = &AbstractFramebuffer::copySub3DImplementationDefault;
#endif
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
renderbufferImplementation = &Framebuffer::renderbufferImplementationDefault;
#ifndef MAGNUM_TARGET_GLES
texture1DImplementation = &Framebuffer::texture1DImplementationDefault;
#endif
Fix Framebuffer::attachCubeMapTexture() behaving as a layered attachment. The DSA function does not accept any texture target parameter so the cube map texture was bound as a whole (and thus behaving as a layered attachment) instead of just a single face. Thanks to @chpatrick for the report.
11 years ago
/* The default implementation is the same for both 2D and cube map textures */
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
texture2DImplementation = &Framebuffer::texture2DImplementationDefault;
Updates for geometry and tessellation shader support in ES 3.2. Turns out the new primitive formats were not enabled for AEP by accident. Fixed that now.
9 years ago
#ifndef MAGNUM_TARGET_GLES
Support for layered texture attachments in Framebuffer. I.e. rendering to a layer addressed by `gl_Layer` in geometry shader.
11 years ago
textureImplementation = &Framebuffer::textureImplementationDefault;
#endif
Fix Framebuffer::attachCubeMapTexture() behaving as a layered attachment. The DSA function does not accept any texture target parameter so the cube map texture was bound as a whole (and thus behaving as a layered attachment) instead of just a single face. Thanks to @chpatrick for the report.
11 years ago
textureCubeMapImplementation = &Framebuffer::texture2DImplementationDefault;
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
Better texture attaching in Framebuffer. The previous way was half-working at best, as it handled array textures improperly. Now there is overload for each texture type. The old way with attachTexture*D() is marked as deprecated and will be removed in future release.
12 years ago
textureLayerImplementation = &Framebuffer::textureLayerImplementationDefault;
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
#endif
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
renderbufferStorageImplementation = &Renderbuffer::storageImplementationDefault;
}
Updates for geometry and tessellation shader support in ES 3.2. Turns out the new primitive formats were not enabled for AEP by accident. Fixed that now.
9 years ago
/* Framebuffer texture attachment on ES3 */
#if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_WEBGL) && !defined(MAGNUM_TARGET_GLES2)
if(context.isVersionSupported(Version::GLES320))
textureImplementation = &Framebuffer::textureImplementationDefault;
else if(context.isExtensionSupported<Extensions::GL::EXT::geometry_shader>())
textureImplementation = &Framebuffer::textureImplementationEXT;
else
textureImplementation = nullptr;
#endif
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
#ifdef MAGNUM_TARGET_GLES2
Simplified *Framebuffer::bind() functionality. This was a leftover from some not-well-thought-out design decision. The function is now used exclusively for binding for draw, as all framebuffer reading functions (blit(), read()) are doing the read binding internally. Moreover it required the user to be extra careful on ES2, because in many cases there are no separate binding points for reading and drawing. The function is now parameter-less and always bind the framebuffer for drawing. The logic for internal binding was also simplified and on ES2 there are separate implementations for single/separate binding points. For *Framebuffer::checkStatus() the documentation was updated to explain the meaning of the parameter on ES2 implementation. Also removed the need for FramebufferTarget::ReadDraw binding, as it was rather confusing. Old *Framebuffer::bind(FramebufferTarget) is now just an alias to the parameter-less function, ignoring the parameter. Along with FramebufferTarget::ReadDraw it is marked as deprecated and will be removed in some future release.
11 years ago
/* Framebuffer binding and checking on ES2 */
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
/* Optimistically set separate binding targets and check if one of the
extensions providing them is available */
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
#ifndef MAGNUM_TARGET_WEBGL
Simplified *Framebuffer::bind() functionality. This was a leftover from some not-well-thought-out design decision. The function is now used exclusively for binding for draw, as all framebuffer reading functions (blit(), read()) are doing the read binding internally. Moreover it required the user to be extra careful on ES2, because in many cases there are no separate binding points for reading and drawing. The function is now parameter-less and always bind the framebuffer for drawing. The logic for internal binding was also simplified and on ES2 there are separate implementations for single/separate binding points. For *Framebuffer::checkStatus() the documentation was updated to explain the meaning of the parameter on ES2 implementation. Also removed the need for FramebufferTarget::ReadDraw binding, as it was rather confusing. Old *Framebuffer::bind(FramebufferTarget) is now just an alias to the parameter-less function, ignoring the parameter. Along with FramebufferTarget::ReadDraw it is marked as deprecated and will be removed in some future release.
11 years ago
bindImplementation = &Framebuffer::bindImplementationDefault;
bindInternalImplementation = &Framebuffer::bindImplementationDefault;
checkStatusImplementation = &Framebuffer::checkStatusImplementationDefault;
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
if(context.isExtensionSupported<Extensions::GL::ANGLE::framebuffer_blit>()) {
extensions.push_back(Extensions::GL::ANGLE::framebuffer_blit::string());
} else if(context.isExtensionSupported<Extensions::GL::APPLE::framebuffer_multisample>()) {
extensions.push_back(Extensions::GL::APPLE::framebuffer_multisample::string());
} else if(context.isExtensionSupported<Extensions::GL::NV::framebuffer_blit>()) {
extensions.push_back(Extensions::GL::NV::framebuffer_blit::string());
/* NV_framebuffer_multisample requires NV_framebuffer_blit, which has these
enums. However, on my system only NV_framebuffer_multisample is
supported, but NV_framebuffer_blit isn't. I will hold my breath and
assume these enums are available. */
} else if(context.isExtensionSupported<Extensions::GL::NV::framebuffer_multisample>()) {
extensions.push_back(Extensions::GL::NV::framebuffer_multisample::string());
Simplified *Framebuffer::bind() functionality. This was a leftover from some not-well-thought-out design decision. The function is now used exclusively for binding for draw, as all framebuffer reading functions (blit(), read()) are doing the read binding internally. Moreover it required the user to be extra careful on ES2, because in many cases there are no separate binding points for reading and drawing. The function is now parameter-less and always bind the framebuffer for drawing. The logic for internal binding was also simplified and on ES2 there are separate implementations for single/separate binding points. For *Framebuffer::checkStatus() the documentation was updated to explain the meaning of the parameter on ES2 implementation. Also removed the need for FramebufferTarget::ReadDraw binding, as it was rather confusing. Old *Framebuffer::bind(FramebufferTarget) is now just an alias to the parameter-less function, ignoring the parameter. Along with FramebufferTarget::ReadDraw it is marked as deprecated and will be removed in some future release.
11 years ago
/* If no such extension is available, reset back to single target */
} else {
bindImplementation = &Framebuffer::bindImplementationSingle;
bindInternalImplementation = &Framebuffer::bindImplementationSingle;
checkStatusImplementation = &Framebuffer::checkStatusImplementationSingle;
}
Fix Framebuffer::checkStatus() on WebGL 1.
8 years ago
#else
checkStatusImplementation = &Framebuffer::checkStatusImplementationSingle;
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
#endif
Clarified and updated *Framebuffer::mapForDraw() implementations. In OpenGL ES 2.0 there is EXT_draw_buffers, which I overlooked somehow, so I added it to extension list and included in the implementation. It combines NV_draw_buffers and NV_fbo_color_attachments, so the implementation now selects one of the two based on which extension is supported, preferring the EXT one. Updated the documentation to be less confusing, fixed extension links. Also the single-output mapForDraw() is not handled separately on ES anymore and just calls DrawBuffers implementation with single parameter, resulting in less generated code. EXT_draw_buffers can also be called on default framebuffer and apparently in ES there is no way to map front framebuffer for drawing, so I removed it from the DefaultFramebuffer::DrawAttachment enum.
11 years ago
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
#ifndef MAGNUM_TARGET_WEBGL
Clarified and updated *Framebuffer::mapForDraw() implementations. In OpenGL ES 2.0 there is EXT_draw_buffers, which I overlooked somehow, so I added it to extension list and included in the implementation. It combines NV_draw_buffers and NV_fbo_color_attachments, so the implementation now selects one of the two based on which extension is supported, preferring the EXT one. Updated the documentation to be less confusing, fixed extension links. Also the single-output mapForDraw() is not handled separately on ES anymore and just calls DrawBuffers implementation with single parameter, resulting in less generated code. EXT_draw_buffers can also be called on default framebuffer and apparently in ES there is no way to map front framebuffer for drawing, so I removed it from the DefaultFramebuffer::DrawAttachment enum.
11 years ago
/* Framebuffer draw mapping on ES2 */
if(context.isExtensionSupported<Extensions::GL::EXT::draw_buffers>()) {
extensions.push_back(Extensions::GL::EXT::draw_buffers::string());
drawBuffersImplementation = &AbstractFramebuffer::drawBuffersImplementationEXT;
} else if(context.isExtensionSupported<Extensions::GL::NV::draw_buffers>()) {
extensions.push_back(Extensions::GL::NV::draw_buffers::string());
drawBuffersImplementation = &AbstractFramebuffer::drawBuffersImplementationNV;
} else drawBuffersImplementation = nullptr;
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
#else
if(context.isExtensionSupported<Extensions::GL::WEBGL::draw_buffers>()) {
extensions.push_back(Extensions::GL::WEBGL::draw_buffers::string());
/* The EXT implementation is exposed in Emscripten */
drawBuffersImplementation = &AbstractFramebuffer::drawBuffersImplementationEXT;
} else drawBuffersImplementation = nullptr;
#endif
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
#endif
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
/* Framebuffer reading implementation in desktop/ES */
#ifndef MAGNUM_TARGET_WEBGL
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
#ifndef MAGNUM_TARGET_GLES
if(context.isExtensionSupported<Extensions::GL::ARB::robustness>())
#else
if(context.isExtensionSupported<Extensions::GL::EXT::robustness>())
#endif
{
#ifndef MAGNUM_TARGET_GLES
push_back -> emplace_back
9 years ago
extensions.emplace_back(Extensions::GL::ARB::robustness::string());
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
#else
extensions.push_back(Extensions::GL::EXT::robustness::string());
#endif
readImplementation = &AbstractFramebuffer::readImplementationRobustness;
} else readImplementation = &AbstractFramebuffer::readImplementationDefault;
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
/* Framebuffer reading in WebGL */
#else
readImplementation = &AbstractFramebuffer::readImplementationDefault;
#endif
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
/* Multisample renderbuffer storage implementation */
#ifndef MAGNUM_TARGET_GLES
Full ARB_direct_state_access support in framebuffers. In comparison to EXT_DSA, ARB_DSA also knows how to blit and invalidate without binding, yay!
12 years ago
if(context.isExtensionSupported<Extensions::GL::ARB::direct_state_access>()) {
/* Extension added above */
renderbufferStorageMultisampleImplementation = &Renderbuffer::storageMultisampleImplementationDSA;
} else if(context.isExtensionSupported<Extensions::GL::EXT::direct_state_access>()) {
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
/* Extension added above */
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.
12 years ago
renderbufferStorageMultisampleImplementation = &Renderbuffer::storageMultisampleImplementationDSAEXT;
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
} else
#endif
{
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
#if defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
if(context.isExtensionSupported<Extensions::GL::ANGLE::framebuffer_multisample>()) {
extensions.push_back(Extensions::GL::ANGLE::framebuffer_multisample::string());
renderbufferStorageMultisampleImplementation = &Renderbuffer::storageMultisampleImplementationANGLE;
} else if (context.isExtensionSupported<Extensions::GL::NV::framebuffer_multisample>()) {
extensions.push_back(Extensions::GL::NV::framebuffer_multisample::string());
renderbufferStorageMultisampleImplementation = &Renderbuffer::storageMultisampleImplementationNV;
} else renderbufferStorageMultisampleImplementation = nullptr;
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
#elif !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
renderbufferStorageMultisampleImplementation = &Renderbuffer::storageMultisampleImplementationDefault;
#endif
}
Proper no-op fallback for *Framebuffer::invalidate*(). The documentation of ARB_invalidate_subdata mentions that all the functions are really just a hint for the implementation to make some performance optimizations and they are not affecting behavior at all. So it's perfectly fine to do nothing if the extension is not supported. I didn't do this originally as I mistakenly thought that invalidating depth buffer would somehow behave the same as clearing it, but that's not the case.
12 years ago
/* Framebuffer invalidation implementation on desktop GL */
#ifndef MAGNUM_TARGET_GLES
if(context.isExtensionSupported<Extensions::GL::ARB::invalidate_subdata>()) {
push_back -> emplace_back
9 years ago
extensions.emplace_back(Extensions::GL::ARB::invalidate_subdata::string());
Proper no-op fallback for *Framebuffer::invalidate*(). The documentation of ARB_invalidate_subdata mentions that all the functions are really just a hint for the implementation to make some performance optimizations and they are not affecting behavior at all. So it's perfectly fine to do nothing if the extension is not supported. I didn't do this originally as I mistakenly thought that invalidating depth buffer would somehow behave the same as clearing it, but that's not the case.
12 years ago
Full ARB_direct_state_access support in framebuffers. In comparison to EXT_DSA, ARB_DSA also knows how to blit and invalidate without binding, yay!
12 years ago
if(context.isExtensionSupported<Extensions::GL::ARB::direct_state_access>()) {
/* Extension added above */
invalidateImplementation = &AbstractFramebuffer::invalidateImplementationDSA;
invalidateSubImplementation = &AbstractFramebuffer::invalidateImplementationDSA;
} else {
invalidateImplementation = &AbstractFramebuffer::invalidateImplementationDefault;
invalidateSubImplementation = &AbstractFramebuffer::invalidateImplementationDefault;
}
Proper no-op fallback for *Framebuffer::invalidate*(). The documentation of ARB_invalidate_subdata mentions that all the functions are really just a hint for the implementation to make some performance optimizations and they are not affecting behavior at all. So it's perfectly fine to do nothing if the extension is not supported. I didn't do this originally as I mistakenly thought that invalidating depth buffer would somehow behave the same as clearing it, but that's not the case.
12 years ago
} else {
invalidateImplementation = &AbstractFramebuffer::invalidateImplementationNoOp;
invalidateSubImplementation = &AbstractFramebuffer::invalidateImplementationNoOp;
}
/* Framebuffer invalidation implementation on ES2 */
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
#elif defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
Proper no-op fallback for *Framebuffer::invalidate*(). The documentation of ARB_invalidate_subdata mentions that all the functions are really just a hint for the implementation to make some performance optimizations and they are not affecting behavior at all. So it's perfectly fine to do nothing if the extension is not supported. I didn't do this originally as I mistakenly thought that invalidating depth buffer would somehow behave the same as clearing it, but that's not the case.
12 years ago
if(context.isExtensionSupported<Extensions::GL::EXT::discard_framebuffer>()) {
extensions.push_back(Extensions::GL::EXT::discard_framebuffer::string());
invalidateImplementation = &AbstractFramebuffer::invalidateImplementationDefault;
} else {
invalidateImplementation = &AbstractFramebuffer::invalidateImplementationNoOp;
}
/* Always available on ES3 */
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
#elif !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
Proper no-op fallback for *Framebuffer::invalidate*(). The documentation of ARB_invalidate_subdata mentions that all the functions are really just a hint for the implementation to make some performance optimizations and they are not affecting behavior at all. So it's perfectly fine to do nothing if the extension is not supported. I didn't do this originally as I mistakenly thought that invalidating depth buffer would somehow behave the same as clearing it, but that's not the case.
12 years ago
invalidateImplementation = &AbstractFramebuffer::invalidateImplementationDefault;
invalidateSubImplementation = &AbstractFramebuffer::invalidateImplementationDefault;
#endif
Decide between ANGLE/NV implementation for Framebuffer::blit() on ES. Currently both disabled until extension loader is in place.
12 years ago
Full ARB_direct_state_access support in framebuffers. In comparison to EXT_DSA, ARB_DSA also knows how to blit and invalidate without binding, yay!
12 years ago
/* Blit implementation on desktop GL */
#ifndef MAGNUM_TARGET_GLES
if(context.isExtensionSupported<Extensions::GL::ARB::direct_state_access>()) {
/* Extension added above */
blitImplementation = &AbstractFramebuffer::blitImplementationDSA;
} else blitImplementation = &AbstractFramebuffer::blitImplementationDefault;
Decide between ANGLE/NV implementation for Framebuffer::blit() on ES. Currently both disabled until extension loader is in place.
12 years ago
/* Blit implementation on ES2 */
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
#elif defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
Decide between ANGLE/NV implementation for Framebuffer::blit() on ES. Currently both disabled until extension loader is in place.
12 years ago
if(context.isExtensionSupported<Extensions::GL::ANGLE::framebuffer_blit>()) {
extensions.push_back(Extensions::GL::ANGLE::framebuffer_blit::string());
blitImplementation = &AbstractFramebuffer::blitImplementationANGLE;
} else if(context.isExtensionSupported<Extensions::GL::NV::framebuffer_blit>()) {
extensions.push_back(Extensions::GL::NV::framebuffer_blit::string());
blitImplementation = &AbstractFramebuffer::blitImplementationNV;
} else blitImplementation = nullptr;
Full ARB_direct_state_access support in framebuffers. In comparison to EXT_DSA, ARB_DSA also knows how to blit and invalidate without binding, yay!
12 years ago
Properly initialize AbstractFramebuffer::blit() implementation on WebGL 2.
11 years ago
/* Always available on ES3 and WebGL 2 */
#elif !defined(MAGNUM_TARGET_GLES2)
Full ARB_direct_state_access support in framebuffers. In comparison to EXT_DSA, ARB_DSA also knows how to blit and invalidate without binding, yay!
12 years ago
blitImplementation = &AbstractFramebuffer::blitImplementationDefault;
Decide between ANGLE/NV implementation for Framebuffer::blit() on ES. Currently both disabled until extension loader is in place.
12 years ago
#endif
First-class WebGL support, part 5: reduced framebuffer functionality.
11 years ago
#if defined(MAGNUM_TARGET_WEBGL) && !defined(MAGNUM_TARGET_GLES2)
static_cast<void>(context);
static_cast<void>(extensions);
#endif
Moved global data from framebuffer classes to per-context state. On the way to unify and reduce the "Using optional features" messages.
12 years ago
}
Ability to reset internal state tracker.
12 years ago
void FramebufferState::reset() {
readBinding = drawBinding = renderbufferBinding = State::DisengagedBinding;
Parametrize disengaged viewport instead of using default-constructed value.
11 years ago
viewport = DisengagedViewport;
Ability to reset internal state tracker.
12 years ago
}
Split the OpenGL layer out, pt 4: new Magnum::GL namespace. At the moment just the GL library itself w/o the tests, and without backwards compatibility aliases. The following types were left in the root namespace, despite being in the GL/ directory, as they will get moved back soon: * Image, CompressedImage and their dimensional typedefs * ImageView, CompressedImageView and their dimensional typedefs * PixelStorage Not PixelFormat etc., that one will stay in the GL namespace and a completely new PixelFormat enum will be provided in the root namespace.
8 years ago
}}}