Added MRT support to canvases via love.graphics.setCanvases(c1, c2, ...), and an 'effects' callback function in shaders.

- Simultanious rendering to multiple canvases requires all canvases to be the same size (limitation of pre-GL3.0 framebuffers)
- love.graphics.isSupported("mrtcanvas") was added
- love_Canvases[n] (0-based array of active canvases) can be written to in pixel shaders in the 'effects' callback function
- everything drawn to multiple canvases at once will be duplicated to all canvases if no shader is active or the standard 'effect' shader function is used

--HG--
branch : MRTs
This commit is contained in:
Alex Szpakowski
2013-03-24 02:20:15 -03:00
parent 2009124cf9
commit 2ea065c68b
9 changed files with 377 additions and 87 deletions
+1
View File
@@ -158,6 +158,7 @@ StringMap<Graphics::Support, Graphics::SUPPORT_MAX_ENUM>::Entry Graphics::suppor
{
{ "canvas", Graphics::SUPPORT_CANVAS },
{ "hdrcanvas", Graphics::SUPPORT_HDR_CANVAS },
{ "mrtcanvas", Graphics::SUPPORT_MRT_CANVAS },
{ "shader", Graphics::SUPPORT_SHADER },
{ "npot", Graphics::SUPPORT_NPOT },
{ "subtractive", Graphics::SUPPORT_SUBTRACTIVE },
+1
View File
@@ -87,6 +87,7 @@ public:
{
SUPPORT_CANVAS = 1,
SUPPORT_HDR_CANVAS,
SUPPORT_MRT_CANVAS,
SUPPORT_SHADER,
SUPPORT_NPOT,
SUPPORT_SUBTRACTIVE,
+130 -2
View File
@@ -59,6 +59,12 @@ struct FramebufferStrategy
*/
virtual void deleteFBO(GLuint, GLuint, GLuint) {}
virtual void bindFBO(GLuint) {}
/// attach additional canvases to this framebuffer for rendering
/**
* @param[in] canvases List of canvases to attach
**/
virtual void setAttachments(const std::vector<Canvas *> &canvases) {}
};
struct FramebufferStrategyGL3 : public FramebufferStrategy
@@ -127,6 +133,35 @@ struct FramebufferStrategyGL3 : public FramebufferStrategy
{
glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
}
virtual void setAttachments(const std::vector<Canvas *> &canvases)
{
if (canvases.size() == 0)
{
// set a single render target
glDrawBuffer(GL_COLOR_ATTACHMENT0);
return;
}
std::vector<GLenum> drawbuffers;
drawbuffers.push_back(GL_COLOR_ATTACHMENT0);
// attach the canvas framebuffer textures to the currently bound framebuffer
for (int i = 0; i < canvases.size(); i++)
{
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1 + i,
GL_TEXTURE_2D, canvases[i]->getTextureName(), 0);
drawbuffers.push_back(GL_COLOR_ATTACHMENT1 + i);
}
// set up multiple render targets
if (GLEE_VERSION_2_0)
glDrawBuffers(drawbuffers.size(), &drawbuffers[0]);
else if (GLEE_ARB_draw_buffers)
glDrawBuffersARB(drawbuffers.size(), &drawbuffers[0]);
else if (GLEE_ATI_draw_buffers)
glDrawBuffersATI(drawbuffers.size(), &drawbuffers[0]);
}
};
struct FramebufferStrategyPackedEXT : public FramebufferStrategy
@@ -196,6 +231,35 @@ struct FramebufferStrategyPackedEXT : public FramebufferStrategy
{
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framebuffer);
}
virtual void setAttachments(const std::vector<Canvas *> &canvases)
{
if (canvases.size() == 0)
{
// set a single render target
glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT);
return;
}
std::vector<GLenum> drawbuffers;
drawbuffers.push_back(GL_COLOR_ATTACHMENT0_EXT);
// attach the canvas framebuffer textures to the currently bound framebuffer
for (int i = 0; i < canvases.size(); i++)
{
glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1_EXT + i,
GL_TEXTURE_2D, canvases[i]->getTextureName(), 0);
drawbuffers.push_back(GL_COLOR_ATTACHMENT1_EXT + i);
}
// set up multiple render targets
if (GLEE_VERSION_2_0)
glDrawBuffers(drawbuffers.size(), &drawbuffers[0]);
else if (GLEE_ARB_draw_buffers)
glDrawBuffersARB(drawbuffers.size(), &drawbuffers[0]);
else if (GLEE_ATI_draw_buffers)
glDrawBuffersATI(drawbuffers.size(), &drawbuffers[0]);
}
};
struct FramebufferStrategyEXT : public FramebufferStrategyPackedEXT
@@ -288,6 +352,9 @@ static void getStrategy()
}
}
static int maxFBOColorAttachments = 0;
static int maxDrawBuffers = 0;
Canvas::Canvas(int width, int height, TextureType texture_type)
: width(width)
, height(height)
@@ -338,11 +405,26 @@ bool Canvas::isSupported()
return (strategy != &strategyNone);
}
bool Canvas::isHdrSupported()
bool Canvas::isHDRSupported()
{
return GLEE_VERSION_3_0 || GLEE_ARB_texture_float;
}
bool Canvas::isMRTSupported()
{
if (!(isSupported() && (GLEE_VERSION_2_0 || GLEE_ARB_draw_buffers || GLEE_ATI_draw_buffers)))
return false;
if (maxFBOColorAttachments == 0 || maxDrawBuffers == 0)
{
glGetIntegerv(GL_MAX_COLOR_ATTACHMENTS, &maxFBOColorAttachments);
glGetIntegerv(GL_MAX_DRAW_BUFFERS, &maxDrawBuffers);
}
// system must support at least 4 simultanious render targets
return maxFBOColorAttachments >= 4 && maxDrawBuffers >= 4;
}
void Canvas::bindDefaultCanvas()
{
if (current != NULL)
@@ -379,6 +461,42 @@ void Canvas::startGrab()
current = this;
}
void Canvas::startGrab(const std::vector<Canvas *> &canvases)
{
if (canvases.size() > 0)
{
if (!isMRTSupported())
throw love::Exception("Multiple render targets are not supported on this system.");
if (canvases.size() + 1 > maxDrawBuffers || canvases.size() + 1 > maxFBOColorAttachments)
throw love::Exception("This system can't support %d simultanious render targets.", canvases.size() + 1);
}
for (size_t i = 0; i < canvases.size(); i++)
{
if (canvases[i]->getWidth() != width || canvases[i]->getHeight() != height)
throw love::Exception("All canvas arguments must have the same dimensions.");
}
startGrab();
// don't attach anything if there's nothing to attach/detach
if (canvases.size() == 0 && attachedCanvases.size() == 0)
return;
strategy->setAttachments(canvases);
// retain newly attached canvases
for (size_t i = 0; i < canvases.size(); i++)
canvases[i]->retain();
// release previously attached canvases
for (size_t i = 0; i < attachedCanvases.size(); i++)
attachedCanvases[i]->release();
attachedCanvases = canvases;
}
void Canvas::stopGrab()
{
// i am not grabbing. leave me alone
@@ -393,7 +511,6 @@ void Canvas::stopGrab()
current = NULL;
}
void Canvas::clear(const Color &c)
{
GLuint previous = 0;
@@ -472,6 +589,11 @@ void Canvas::getPixel(unsigned char* pixel_rgba, int x, int y)
strategy->bindFBO( 0 );
}
const std::vector<Canvas *> &Canvas::getAttachedCanvases() const
{
return attachedCanvases;
}
void Canvas::setFilter(const Image::Filter &f)
{
bindTexture(img);
@@ -515,6 +637,12 @@ void Canvas::unloadVolatile()
settings.filter = getFilter();
settings.wrap = getWrap();
strategy->deleteFBO(fbo, depth_stencil, img);
// release attached canvases
for (size_t i = 0; i < attachedCanvases.size(); i++)
attachedCanvases[i]->release();
attachedCanvases.clear();
}
int Canvas::getWidth()
+19 -4
View File
@@ -21,6 +21,7 @@
#ifndef LOVE_GRAPHICS_OPENGL_CANVAS_H
#define LOVE_GRAPHICS_OPENGL_CANVAS_H
// LOVE
#include "graphics/DrawQable.h"
#include "graphics/Volatile.h"
#include "graphics/Image.h"
@@ -31,6 +32,9 @@
#include "common/Matrix.h"
#include "OpenGL.h"
// STL
#include <vector>
namespace love
{
namespace graphics
@@ -50,7 +54,11 @@ public:
Canvas(int width, int height, TextureType texture_type = TYPE_NORMAL);
virtual ~Canvas();
void startGrab();
/**
* @param canvases A list of other canvases to temporarily attach to this one,
* to allow drawing to multiple canvases at once.
**/
void startGrab(const std::vector<Canvas *> &canvases);
void stopGrab();
void clear(const Color &c);
@@ -66,6 +74,8 @@ public:
void getPixel(unsigned char* pixel_rgba, int x, int y);
const std::vector<Canvas *> &getAttachedCanvases() const;
void setFilter(const Image::Filter &f);
Image::Filter getFilter() const;
@@ -89,20 +99,22 @@ public:
void unloadVolatile();
static bool isSupported();
static bool isHdrSupported();
static bool isHDRSupported();
static bool isMRTSupported();
static bool getConstant(const char *in, TextureType &out);
static bool getConstant(TextureType in, const char *&out);
static Canvas *current;
static void bindDefaultCanvas();
private:
friend class Shader;
GLuint getTextureName() const
{
return img;
}
private:
friend class Shader;
GLsizei width;
GLsizei height;
GLuint fbo;
@@ -121,6 +133,9 @@ private:
Image::Wrap wrap;
} settings;
std::vector<Canvas *> attachedCanvases;
void startGrab();
void drawv(const Matrix &t, const vertex *v) const;
static StringMap<TextureType, TYPE_MAX_ENUM>::Entry textureTypeEntries[];
+1 -1
View File
@@ -397,7 +397,7 @@ ParticleSystem *Graphics::newParticleSystem(Image *image, int size)
Canvas *Graphics::newCanvas(int width, int height, Canvas::TextureType texture_type)
{
if (texture_type == Canvas::TYPE_HDR && !Canvas::isHdrSupported())
if (texture_type == Canvas::TYPE_HDR && !Canvas::isHDRSupported())
throw Exception("HDR Canvases are not supported by your OpenGL implementation");
while (GL_NO_ERROR != glGetError())
+9 -1
View File
@@ -47,7 +47,15 @@ int w_Canvas_renderTo(lua_State *L)
if (!lua_isfunction(L, 2))
return luaL_error(L, "Need a function to render to canvas.");
canvas->startGrab();
static std::vector<Canvas *> attachments;
try
{
canvas->startGrab(attachments);
}
catch (love::Exception &e)
{
return luaL_error(L, "%s", e.what());
}
lua_settop(L, 2); // make sure the function is on top of the stack
lua_call(L, 0, 0);
canvas->stopGrab();
+54 -5
View File
@@ -942,9 +942,41 @@ int w_setCanvas(lua_State *L)
return 0;
}
Canvas *canvas = luax_checkcanvas(L, 1);
// this unbinds the previous fbo
canvas->startGrab();
bool is_table = lua_istable(L, 1);
std::vector<Canvas *> attachments;
Canvas *canvas = 0;
if (is_table)
{
lua_pushinteger(L, 1);
lua_gettable(L, 1);
canvas = luax_checkcanvas(L, -1);
lua_pop(L, 1);
for (int i = 2; i <= lua_objlen(L, 1); i++)
{
lua_pushinteger(L, i);
lua_gettable(L, 1);
attachments.push_back(luax_checkcanvas(L, -1));
lua_pop(L, 1);
}
}
else
{
canvas = luax_checkcanvas(L, 1);
for (int i = 2; i <= lua_gettop(L); i++)
attachments.push_back(luax_checkcanvas(L, i));
}
try
{
canvas->startGrab(attachments);
}
catch (love::Exception &e)
{
return luaL_error(L, "%s", e.what());
}
return 0;
}
@@ -952,14 +984,25 @@ int w_setCanvas(lua_State *L)
int w_getCanvas(lua_State *L)
{
Canvas *canvas = Canvas::current;
int n = 1;
if (canvas)
{
canvas->retain();
luax_newtype(L, "Canvas", GRAPHICS_CANVAS_T, (void *) canvas);
const std::vector<Canvas *> &attachments = canvas->getAttachedCanvases();
for (size_t i = 0; i < attachments.size(); i++)
{
attachments[i]->retain();
luax_newtype(L, "Canvas", GRAPHICS_CANVAS_T, (void *) attachments[i]);
n++;
}
}
else
lua_pushnil(L);
return 1;
return n;
}
int w_setShader(lua_State *L)
@@ -1009,7 +1052,11 @@ int w_isSupported(lua_State *L)
supported = false;
break;
case Graphics::SUPPORT_HDR_CANVAS:
if (!Canvas::isHdrSupported())
if (!Canvas::isHDRSupported())
supported = false;
break;
case Graphics::SUPPORT_MRT_CANVAS:
if (!Canvas::isMRTSupported())
supported = false;
break;
case Graphics::SUPPORT_SHADER:
@@ -1427,7 +1474,9 @@ static const luaL_Reg functions[] =
{ "getMaxPointSize", w_getMaxPointSize },
{ "newScreenshot", w_newScreenshot },
{ "setCanvas", w_setCanvas },
{ "setCanvases", w_setCanvas },
{ "getCanvas", w_getCanvas },
{ "getCanvases", w_getCanvas },
{ "setShader", w_setShader },
{ "getShader", w_getShader },