LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 19:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Slightly improved performance of love.graphics.setCanvases

Browse Source
This commit is contained in:
Alex Szpakowski
2013-06-27 01:43:32 -03:00
parent 8b261abfdc
commit 80122d67e6
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Canvas.cpp
+13 -8
View File
@@ -179,7 +179,7 @@ struct FramebufferStrategyGL3 : public FramebufferStrategy
std::vector<GLenum> drawbuffers; std::vector<GLenum> drawbuffers;
drawbuffers.push_back(GL_COLOR_ATTACHMENT0); drawbuffers.push_back(GL_COLOR_ATTACHMENT0);
// attach the canvas framebuffer textures to the currently bound framebuffer // Attach the canvas textures to the currently bound framebuffer.
for (size_t i = 0; i < canvases.size(); i++) for (size_t i = 0; i < canvases.size(); i++)
{ {
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1 + i, glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1 + i,
@@ -290,7 +290,7 @@ struct FramebufferStrategyPackedEXT : public FramebufferStrategy
std::vector<GLenum> drawbuffers; std::vector<GLenum> drawbuffers;
drawbuffers.push_back(GL_COLOR_ATTACHMENT0_EXT); drawbuffers.push_back(GL_COLOR_ATTACHMENT0_EXT);
// attach the canvas framebuffer textures to the currently bound framebuffer // Attach the canvas textures to the currently bound framebuffer.
for (size_t i = 0; i < canvases.size(); i++) for (size_t i = 0; i < canvases.size(); i++)
{ {
glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1_EXT + i, glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1_EXT + i,
@@ -452,7 +452,7 @@ void Canvas::setupGrab()
if (current != NULL) if (current != NULL)
current->stopGrab(); current->stopGrab();
// bind buffer and clear screen // bind the framebuffer object.
glPushAttrib(GL_VIEWPORT_BIT | GL_TRANSFORM_BIT); glPushAttrib(GL_VIEWPORT_BIT | GL_TRANSFORM_BIT);
strategy->bindFBO(fbo); strategy->bindFBO(fbo);
gl.setViewport(OpenGL::Viewport(0, 0, width, height)); gl.setViewport(OpenGL::Viewport(0, 0, width, height));
@@ -474,6 +474,10 @@ void Canvas::setupGrab()
void Canvas::startGrab(const std::vector<Canvas *> &canvases) void Canvas::startGrab(const std::vector<Canvas *> &canvases)
{ {
// Whether the new canvas list is different from the old one.
// A more thorough check is done below.
bool canvaseschanged = canvases.size() != attachedCanvases.size();
if (canvases.size() > 0) if (canvases.size() > 0)
{ {
if (!isMultiCanvasSupported()) if (!isMultiCanvasSupported())
@@ -490,22 +494,23 @@ void Canvas::startGrab(const std::vector<Canvas *> &canvases)
if (canvases[i]->getTextureType() != texture_type) if (canvases[i]->getTextureType() != texture_type)
throw love::Exception("All canvas arguments must have the same texture type."); throw love::Exception("All canvas arguments must have the same texture type.");
if (!canvaseschanged && canvases[i] != attachedCanvases[i])
canvaseschanged = true;
} }
setupGrab(); setupGrab();
// don't attach anything if there's nothing to attach/detach // Don't attach anything if there's nothing to change.
if (canvases.size() == 0 && attachedCanvases.size() == 0) if (!canvaseschanged)
return; return;
// attach the canvas textures to the active FBO and set up multiple render targets // Attach the canvas textures to the active FBO and set up MRTs.
strategy->setAttachments(canvases); strategy->setAttachments(canvases);
// retain newly attached canvases
for (size_t i = 0; i < canvases.size(); i++) for (size_t i = 0; i < canvases.size(); i++)
canvases[i]->retain(); canvases[i]->retain();
// release any old canvases
for (size_t i = 0; i < attachedCanvases.size(); i++) for (size_t i = 0; i < attachedCanvases.size(); i++)
attachedCanvases[i]->release(); attachedCanvases[i]->release();