From d5dce6284ff0b115fe70fde3ffd8da3f89806907 Mon Sep 17 00:00:00 2001
From: vrld <vrld@vrld.org>
Date: Wed, 7 Sep 2011 13:42:51 +0200
Subject: [PATCH] Fix issue #294: Canvas not working when not rendering to
 default render target.

---
 src/modules/graphics/opengl/Canvas.h          | 21 +++++++++++++++++++
 src/modules/graphics/opengl/wrap_Graphics.cpp |  4 ++++
 2 files changed, 25 insertions(+)

diff --git a/src/modules/graphics/opengl/Canvas.h b/src/modules/graphics/opengl/Canvas.h
index dd69140e7..ae07ce9c7 100644
--- a/src/modules/graphics/opengl/Canvas.h
+++ b/src/modules/graphics/opengl/Canvas.h
@@ -49,6 +49,27 @@ namespace opengl
 		bool loadVolatile();
 		void unloadVolatile();
 
+		/// Unbind the current canvas on construction and rebind it upon destruction.
+		// Exception safe temporary unbinding/rebinding for techniques that require
+		// the default canvas to work (e.g. stencils).
+		// XXX: If a canvas is switched between creating and destroying an unbinder
+		//      object, the canvas will not be switched back.
+		struct TemporaryUnbinder
+		{
+			Canvas * canvas;
+			inline TemporaryUnbinder() : canvas(Canvas::current)
+			{
+				if (NULL != canvas)
+					Canvas::bindDefaultCanvas();
+			}
+
+			inline ~TemporaryUnbinder()
+			{
+				if (NULL != canvas && NULL == Canvas::current)
+					canvas->startGrab();
+			}
+		};
+
 	private:
 		friend class PixelEffect;
 		GLuint getTextureName() const { return img; }
diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp
index 0de2d5e10..6faaefb53 100644
--- a/src/modules/graphics/opengl/wrap_Graphics.cpp
+++ b/src/modules/graphics/opengl/wrap_Graphics.cpp
@@ -24,6 +24,7 @@
 #include <font/Rasterizer.h>
 
 #include <scripts/graphics.lua.h>
+#include <cassert>
 
 namespace love
 {
@@ -168,6 +169,9 @@ namespace opengl
 
 	static int setStencil(lua_State * L, bool invert)
 	{
+		// stencils require the default fb to work properly
+		Canvas::TemporaryUnbinder unbinder;
+
 		// no argument -> clear mask
 		if (lua_isnoneornil(L, 1)) {
 			instance->discardStencil();