Merge lp:~compiz-team/compiz/compiz.performance_1040478 into lp:compiz/0.9.9

[Sam Spilsbury]

Implement support for glBlitFramebuffer. On some platforms this may speed up the final composite operation as we skip the fragment processor entirely.

The logic around this code is basically that if glBlitFramebuffer fails, then we don't use it again (the failure case is it not being available), and use the fallback textured draw code.

Tests added for the new module FramebufferDirectDraw.

Proposing this now so I can get some early feedback.

Implement support for glBlitFramebuffer. On some platforms this may speed up the final composite operation as we skip the fragment processor entirely.

The logic around this code is basically that if glBlitFramebuffer fails, then we don't use it again (the failure case is it not being available), and use the fallback textured draw code.

Tests added for the new module FramebufferDirectDraw.

The API and ABI of GLFramebufferObject were broken too so that we could specify which buffer we actually wanted to bind. Distro says they're okay with this.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3387
http://jenkins.qa.ubuntu.com/job/compiz-ci/77/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/77/console

review: Needs Fixing (continuous-integration)

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3388
http://jenkins.qa.ubuntu.com/job/compiz-ci/78/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/78/console

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

I have not seen any improvement yet myself. It would have to be quite significant to risk large changes to the 0.9.8 tree right now.

As far as I can tell, this is not required for quantal. So please repropose it after we've branched for 0.9.9.

review: Needs Resubmitting

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3388
http://jenkins.qa.ubuntu.com/job/compiz-ci/141/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/141/console

review: Needs Fixing (continuous-integration)

[lp:~compiz-team/compiz/compiz.performance_1040478]

3389. By Sam Spilsbury on 2012-10-02

Merge lp:compiz

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3389
http://jenkins.qa.ubuntu.com/job/compiz-ci/152/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/152/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Don't we want to fix bug 1051287 before merging this?

review: Needs Information

[Sam Spilsbury (smspillaz)]

Probably a good idea. Lets do that.

[Sam Spilsbury (smspillaz)]

Though, I'm not entirely certain. In order to fix it properly I'll need to add a concept of framebuffer bindings points to opengl, that could inflate this change a little more (or at least introduce a dependency)

[Daniel van Vugt (vanvugt)]

OK, then. Bug 1051287 needs fixing here.

review: Needs Fixing

[lp:~compiz-team/compiz/compiz.performance_1040478]

3390. By Sam Spilsbury on 2012-12-07

Merge e lp:compiz

3391. By Sam Spilsbury on 2012-12-07

Merge lp:compiz

3392. By Sam Spilsbury on 2012-12-07

Simplify lots of variable names, unindent namespaces

3393. By Sam Spilsbury on 2012-12-07

Set the stencil and depth attachments in allocate and not bind

3394. By Sam Spilsbury on 2012-12-07

Refactored large parts of the code, make binding the concern of BindLocation

3395. By Sam Spilsbury on 2012-12-13

Merge lp:compiz

3396. By Sam Spilsbury on 2012-12-21

Moved the creation of directly drawable fbo's into a convenience method
so that other plugins can create them

3397. By Sam Spilsbury on 2012-12-21

Fix compile error on tests

3398. By Sam Spilsbury on 2012-12-22

We don't need to provide a BindableFramebuffer to access the backbuffer

3399. By Sam Spilsbury on 2012-12-22

Unbind framebuffers before processing output change

3400. By Sam Spilsbury on 2012-12-22

Invert y-coords of glBlitFramebuffer operation

3401. By Sam Spilsbury on 2012-12-23

Reset framebuffer status on reallocation

3402. By Sam Spilsbury on 2013-01-03

Merge lp:compiz

3403. By Sam Spilsbury on 2013-01-04

Remove unused variable

3404. By Sam Spilsbury on 2013-01-30

Merge lp:compiz

3405. By Sam Spilsbury on 2013-02-10

Merge lp:compiz

3406. By Sam Spilsbury on 2013-02-12

Merge lp:compiz

3407. By Sam Spilsbury on 2013-02-12

Remove referenes to configure buffers

3408. By Sam Spilsbury on 2013-02-12

Revert trunk merge as it was broken

3409. By Sam Spilsbury on 2013-02-12

Merge lp:compiz

3410. By Sam Spilsbury on 2013-02-12

Unrevert changes which shouldn't have been reverted

3411. By Sam Spilsbury on 2013-02-12

Another botched merge

3412. By Sam Spilsbury on 2013-02-13

Merge lp:compiz

3413. By Sam Spilsbury on 2013-02-13

Fix merge errors

3414. By Sam Spilsbury on 2013-02-15

Merge lp:compiz

3415. By Sam Spilsbury on 2013-02-18

Revert more changes which should not have happened

3416. By Sam Spilsbury on 2013-02-18

Make the currently bound drawbuffer available to plugins (as they might want
to do a read/draw swap)

3417. By Sam Spilsbury on 2013-02-25

Merge lp:compiz

3418. By Sam Spilsbury on 2013-02-27

Merge lp:compiz

3419. By Sam Spilsbury on 2013-02-28

Unrevert changes reverted by a merge

Unmerged revisions

3419. By Sam Spilsbury on 2013-02-28

Unrevert changes reverted by a merge

3418. By Sam Spilsbury on 2013-02-27

Merge lp:compiz

3417. By Sam Spilsbury on 2013-02-25

Merge lp:compiz

3416. By Sam Spilsbury on 2013-02-18

Make the currently bound drawbuffer available to plugins (as they might want
to do a read/draw swap)

3415. By Sam Spilsbury on 2013-02-18

Revert more changes which should not have happened

3414. By Sam Spilsbury on 2013-02-15

Merge lp:compiz

3413. By Sam Spilsbury on 2013-02-13

Fix merge errors

3412. By Sam Spilsbury on 2013-02-13

Merge lp:compiz

3411. By Sam Spilsbury on 2013-02-12

Another botched merge

3410. By Sam Spilsbury on 2013-02-12

Unrevert changes which shouldn't have been reverted

=== modified file 'plugins/opengl/CMakeLists.txt'
--- plugins/opengl/CMakeLists.txt	2012-09-22 04:00:52 +0000
+++ plugins/opengl/CMakeLists.txt	2012-10-02 01:23:21 +0000
@@ -5,13 +5,19 @@
 set (INTERNAL_LIBRARIES
     compiz_opengl_double_buffer
     compiz_opengl_fsregion
+    compiz_opengl_framebuffer_direct_draw
     compiz_opengl_glx_tfp_bind
 )
 
+set (COMPIZ_OPENGL_PLUGIN_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
+set (COMPIZ_OPENGL_PLUGIN_SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/src)
+
 add_subdirectory (src/doublebuffer)
 add_subdirectory (src/fsregion)
+add_subdirectory (src/fbdirectdraw)
 add_subdirectory (src/glxtfpbind)
 
+include_directories (src/fbdirectdraw/include)
 include_directories (src/glxtfpbind/include)
 
 if (USE_GLES)

=== modified file 'plugins/opengl/include/opengl/framebufferobject.h'
--- plugins/opengl/include/opengl/framebufferobject.h	2012-08-09 02:19:26 +0000
+++ plugins/opengl/include/opengl/framebufferobject.h	2012-10-02 01:23:21 +0000
@@ -26,79 +26,225 @@
 #ifndef _COMPIZ_GLFRAMEBUFFEROBJECT_H
 #define _COMPIZ_GLFRAMEBUFFEROBJECT_H
 
-#include <opengl/opengl.h>
-
-struct PrivateGLFramebufferObject;
-
-/**
- * Class representing a framebuffer object in GL, supporting only one
- * color attachment as per GLES 2 spec. The color attachment is referred
- * to as the texture (of the FBO).
- *
- * Usage:
- * 1. create a GLFramebufferObject (requires a GL context)
- * 2. call allocate (size), and check status ()
- * 3. old = bind ()
- * 4. do your rendering
- * 5. rebind (old)
- * 6. use the rendered texture via tex ()
- * 7. go to 2 or 3, or delete to quit (requires a GL context)
- */
-class GLFramebufferObject
+#include <boost/function.hpp>
+#include <opengl/opengl-api.h>
+#include <core/size.h>
+#include <core/rect.h>
+
+class GLVertexBuffer;
+class GLTexture;
+
+namespace compiz
 {
-    public:
-	GLFramebufferObject ();
-	~GLFramebufferObject ();
-
-	/**
-	 * Ensure the texture is of the given size, recreating it if needed,
-	 * and replace the FBO color attachment with it. The texture contents
-	 * become undefined, unless specified in the 'image' argument.
-	 * When specifying 'image', it's also possible to pass-in the
-	 * desired image's 'format' and 'type'.
-	 *
-	 * Returns true on success, and false on texture allocation failure.
-	 */
-	bool allocate (const CompSize &size,
-		       const char *image = NULL,
-		       GLenum format = GL_RGBA,
-		       GLenum type = GL_UNSIGNED_BYTE);
-
-	/**
-	 * Bind this as the current FBO, previous binding in GL context is
-	 * undone. GL rendering is now targeted to this FBO.
-	 * Returns a pointer to the previously bound FBO, or NULL if
-	 * the previous binding was zero (the window system provided
-	 * framebuffer).
-	 *
-	 * The previous FBO is no longer bound, so you can use its
-	 * texture. To restore the previous FBO, call rebind (FBO) with
-	 * the returned pointer as the argument.
-	 */
-	GLFramebufferObject *bind ();
-
-	/**
-	 * Bind the given FBO as the current FBO, without looking up the
-	 * previous binding. The argument can be NULL, in which case the
-	 * window system provided framebuffer gets bound (FBO is unbound).
-	 */
-	static void rebind (GLFramebufferObject *fbo);
-
-	/**
-	 * Check the FBO completeness. Returns true on complete.
-	 * Otherwise returns false and reports the error to log.
-	 */
-	bool checkStatus ();
-
-	/**
-	 * Return a pointer to the texture that is the color attachment.
-	 * This will return NULL, if allocate () has not been called, or
-	 * the last allocate () call failed.
-	 */
-	GLTexture *tex ();
-
-    private:
-	PrivateGLFramebufferObject *priv;
-};
+    namespace opengl
+    {
+	typedef enum _FramebufferBlitInformation
+	{
+	    ColorData = (1 << 0),
+	    StencilData = (1 << 1)
+	} FramebufferBlitInformation;
+
+	typedef enum _FramebufferFilter
+	{
+	    Fast = 0,
+	    Good = 1,
+	} FramebufferFilter;
+
+	typedef enum _FramebufferBindPoint
+	{
+	    Read = 0,
+	    Draw = 1
+	} FramebufferBindPoint;
+
+	class PushableFramebuffer
+	{
+	    public:
+
+		virtual ~PushableFramebuffer () {}
+
+		/* Binds this framebuffer immediately */
+		virtual void pushFBO (FramebufferBindPoint bindPoint) = 0;
+		/* Binds the last bound framebuffer immediately */
+		virtual void popFBO () = 0;
+	};
+
+	typedef boost::function <bool (const CompRect &src,
+				       const CompRect &dst,
+				       GLbitfield     mask,
+				       GLenum         filter)> FramebufferRectangularDrawStrategy;
+	typedef std::list <FramebufferRectangularDrawStrategy> FramebufferRectangularDrawStrategyList;
+
+	class DirectDrawFramebufferStrategies
+	{
+	    public:
+
+		virtual ~DirectDrawFramebufferStrategies () {}
+		virtual void draw (const CompRect             &src,
+				   const CompRect             &dst,
+				   FramebufferBlitInformation mask,
+				   FramebufferFilter          filter) = 0;
+	};
+
+	class FramebufferObject
+	{
+	    public:
+
+		virtual ~FramebufferObject () {}
+
+		/**
+		 * Ensure the texture is of the given size, recreating it if needed,
+		 * and replace the FBO color attachment with it. The texture contents
+		 * become undefined, unless specified in the 'image' argument.
+		 * When specifying 'image', it's also possible to pass-in the
+		 * desired image's 'format' and 'type'.
+		 *
+		 * Returns true on success, and false on texture allocation failure.
+		 */
+		virtual bool allocate (const CompSize &size,
+				       const char *image = NULL,
+				       GLenum format = GL_RGBA,
+				       GLenum type = GL_UNSIGNED_BYTE) = 0;
+
+		/**
+		 * Bind this as the current FBO, previous binding in GL context is
+		 * undone. GL rendering is now targeted to this FBO.
+		 * Returns a pointer to the previously bound FBO, or NULL if
+		 * the previous binding was zero (the window system provided
+		 * framebuffer).
+		 *
+		 * The previous FBO is no longer bound, so you can use its
+		 * texture. To restore the previous FBO, call rebind (FBO) with
+		 * the returned pointer as the argument.
+		 */
+		virtual compiz::opengl::FramebufferObject * bind (compiz::opengl::FramebufferBindPoint bindPoint =
+								      compiz::opengl::Draw) = 0;
+
+		/**
+		 * Check the FBO completeness. Returns true on complete.
+		 * Otherwise returns false and reports the error to log.
+		 */
+		virtual bool checkStatus (compiz::opengl::FramebufferBindPoint bindPoint =
+					      compiz::opengl::Draw) = 0;
+
+		/**
+		 * Return a pointer to the texture that is the color attachment.
+		 * This will return NULL, if allocate () has not been called, or
+		 * the last allocate () call failed.
+		 */
+		virtual GLTexture * tex () = 0;
+	};
+
+	class DirectDrawFramebufferObject :
+	    virtual public compiz::opengl::FramebufferObject
+	{
+	    public:
+
+		virtual ~DirectDrawFramebufferObject () {};
+
+		/**
+		 * Draws a region of the framebuffer object as specified in
+		 * framebuffer-specified co-ordinates as @src co-ordinates in
+		 * the buffer currently bound co-ordinates @dst . @mask indicates
+		 * what kind of data should be propogated downwards. @filter indicates
+		 * what kind of filter should be used when drawing this buffer
+		 *
+		 * This since this code only draws a rectangular region from one
+		 * framebuffer to another, it will try and use the fastest codepath
+		 * possible, falling back to a simple textured draw if
+		 * glBlitFramebuffer is not available
+		 *
+		 */
+		virtual void directDraw (const CompRect                                 &src,
+					 const CompRect                                 &dst,
+					 compiz::opengl::FramebufferBlitInformation     mask,
+					 compiz::opengl::FramebufferFilter		filter) = 0;
+	};
+
+	namespace impl
+	{
+	    namespace cgl = compiz::opengl;
+
+	    struct PrivateGLFramebufferObject;
+
+	    class PushableFramebuffer :
+		public cgl::FramebufferObject
+	    {
+		public:
+
+	    };
+
+	    class FramebufferObject :
+		public cgl::FramebufferObject,
+		public cgl::PushableFramebuffer
+	    {
+		public:
+		    FramebufferObject ();
+		    ~FramebufferObject ();
+
+		    /**
+		     * Ensure the texture is of the given size, recreating it if needed,
+		     * and replace the FBO color attachment with it. The texture contents
+		     * become undefined, unless specified in the 'image' argument.
+		     * When specifying 'image', it's also possible to pass-in the
+		     * desired image's 'format' and 'type'.
+		     *
+		     * Returns true on success, and false on texture allocation failure.
+		     */
+		    bool allocate (const CompSize &size,
+				   const char *image = NULL,
+				   GLenum format = GL_RGBA,
+				   GLenum type = GL_UNSIGNED_BYTE);
+
+		    /**
+		     * Bind this as the current FBO, previous binding in GL context is
+		     * undone. GL rendering is now targeted to this FBO.
+		     * Returns a pointer to the previously bound FBO, or NULL if
+		     * the previous binding was zero (the window system provided
+		     * framebuffer).
+		     *
+		     * The previous FBO is no longer bound, so you can use its
+		     * texture. To restore the previous FBO, call rebind (FBO) with
+		     * the returned pointer as the argument.
+		     */
+		    FramebufferObject *bind (compiz::opengl::FramebufferBindPoint bindPoint =
+						compiz::opengl::Draw);
+
+		    /**
+		     * Bind the given FBO as the current FBO, without looking up the
+		     * previous binding. The argument can be NULL, in which case the
+		     * window system provided framebuffer gets bound (FBO is unbound).
+		     */
+		    static void rebind (FramebufferObject *fbo,
+					compiz::opengl::FramebufferBindPoint bindPoint =
+					  compiz::opengl::Draw);
+
+		    /**
+		     * Check the FBO completeness. Returns true on complete.
+		     * Otherwise returns false and reports the error to log.
+		     */
+		    bool checkStatus (compiz::opengl::FramebufferBindPoint bindPoint =
+					compiz::opengl::Draw);
+
+		    /**
+		     * Return a pointer to the texture that is the color attachment.
+		     * This will return NULL, if allocate () has not been called, or
+		     * the last allocate () call failed.
+		     */
+		    GLTexture * tex ();
+
+		private:
+
+		    /* Binds this framebuffer immediately */
+		    void pushFBO (FramebufferBindPoint bindPoint);
+		    /* Binds the last bound framebuffer immediately */
+		    void popFBO ();
+
+		    PrivateGLFramebufferObject *priv;
+	    };
+	}
+    }
+}
+
+typedef compiz::opengl::impl::FramebufferObject GLFramebufferObject;
 
 #endif // _COMPIZ_GLFRAMEBUFFEROBJECT_H

=== added file 'plugins/opengl/include/opengl/opengl-api.h'
--- plugins/opengl/include/opengl/opengl-api.h	1970-01-01 00:00:00 +0000
+++ plugins/opengl/include/opengl/opengl-api.h	2012-10-02 01:23:21 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2008 Dennis Kasprzyk
+ * Copyright © 2007 Novell, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Dennis Kasprzyk not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Dennis Kasprzyk makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Dennis Kasprzyk <[e-mail]>
+ *          David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPIZ_OPENGL_API_H
+#define _COMPIZ_OPENGL_API_H
+
+#ifdef USE_GLES
+#define SUPPORT_X11
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#else
+#include <GL/gl.h>
+#include <GL/glx.h>
+#endif
+
+#endif

=== modified file 'plugins/opengl/include/opengl/opengl.h'
--- plugins/opengl/include/opengl/opengl.h	2012-09-17 14:36:00 +0000
+++ plugins/opengl/include/opengl/opengl.h	2012-10-02 01:23:21 +0000
@@ -28,23 +28,13 @@
 #ifndef _COMPIZ_OPENGL_H
 #define _COMPIZ_OPENGL_H
 
-#ifdef USE_GLES
-#define SUPPORT_X11
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#else
-#include <GL/gl.h>
-#include <GL/glx.h>
-#endif
+#include <opengl/opengl-api.h>
 
 #include <core/size.h>
 #include <core/pluginclasshandler.h>
 
 #include <opengl/matrix.h>
 #include <opengl/texture.h>
-#include <opengl/framebufferobject.h>
 #include <opengl/vertexbuffer.h>
 #include <opengl/program.h>
 #include <opengl/programcache.h>
@@ -87,6 +77,27 @@
 class PrivateGLScreen;
 class PrivateGLWindow;
 
+namespace compiz
+{
+    namespace opengl
+    {
+	typedef boost::function <bool (const CompRect &src,
+				       const CompRect &dst,
+				       GLbitfield     mask,
+				       GLenum         filter)> BlitFramebufferFunc;
+
+	class DirectDrawFramebufferObject;
+	class FramebufferObject;
+
+	namespace impl
+	{
+	    class FramebufferObject;
+	}
+    }
+}
+
+typedef compiz::opengl::impl::FramebufferObject GLFramebufferObject;
+
 extern GLushort   defaultColor[4];
 
 #ifndef GLX_EXT_texture_from_pixmap
@@ -313,6 +324,18 @@
 					   GLsizei width,
 					   GLsizei height);
 
+    /* GLX_EXT_blit_framebuffer */
+    typedef void (*GLBlitFramebufferProc) (GLint      srcX0,
+					   GLint      srcY0,
+					   GLint      srcX1,
+					   GLint      srcY1,
+					   GLint      dstX0,
+					   GLint      dstY0,
+					   GLint      dstX1,
+					   GLint      dstY1,
+					   GLbitfield mask,
+					   GLenum     filter);
+
 
     /* GL_ARB_shader_objects */
     #ifndef USE_GLES
@@ -413,11 +436,12 @@
     extern GLDisableVertexAttribArrayProc disableVertexAttribArray;
     extern GLVertexAttribPointerProc      vertexAttribPointer;
 
-    extern GLGenRenderbuffersProc genRenderbuffers;
-    extern GLDeleteRenderbuffersProc deleteRenderbuffers;
-    extern GLBindRenderbufferProc    bindRenderbuffer;
+    extern GLGenRenderbuffersProc        genRenderbuffers;
+    extern GLDeleteRenderbuffersProc     deleteRenderbuffers;
+    extern GLBindRenderbufferProc        bindRenderbuffer;
     extern GLFramebufferRenderbufferProc framebufferRenderbuffer;
-    extern GLRenderbufferStorageProc renderbufferStorage;
+    extern GLRenderbufferStorageProc     renderbufferStorage;
+    extern GLBlitFramebufferProc         blitFramebuffer;
 
     #ifndef USE_GLES
     extern GLCreateShaderObjectARBProc createShaderObjectARB;
@@ -579,7 +603,6 @@
 extern GLScreenPaintAttrib defaultScreenPaintAttrib;
 
 class GLScreen;
-class GLFramebufferObject;
 
 class GLScreenInterface :
     public WrapableInterface<GLScreen, GLScreenInterface>
@@ -656,9 +679,9 @@
 	 * @param scratchFbo Describes the final composited FBO that is
 	 * to be rendered.
 	 */
-	virtual void glPaintCompositedOutput (const CompRegion    &region,
-					      GLFramebufferObject *fbo,
-					      unsigned int         mask);
+	virtual void glPaintCompositedOutput (const CompRegion				  &region,
+					      compiz::opengl::DirectDrawFramebufferObject *fbo,
+					      unsigned int				  mask);
 
 	/**
 	 * Hookable function used by plugins to determine stenciling mask
@@ -756,13 +779,18 @@
 	/**
 	 * Returns the FBO compiz is using for the screen
 	 */
-	GLFramebufferObject *fbo ();
+	compiz::opengl::FramebufferObject * fbo();
 
 	/**
 	 * Returns a default icon texture
 	 */
 	GLTexture *defaultIcon ();
 
+	/**
+	 * Returns the current framebuffer function for blitting the framebuffer
+	 */
+	const compiz::opengl::BlitFramebufferFunc & blitFramebufferFunc ();
+
 	void resetRasterPos ();
 
 	bool glInitContext (XVisualInfo *);
@@ -783,7 +811,7 @@
 
 	WRAPABLE_HND (5, GLScreenInterface, GLMatrix *, projectionMatrix);
 	WRAPABLE_HND (6, GLScreenInterface, void, glPaintCompositedOutput,
-		      const CompRegion &, GLFramebufferObject *, unsigned int);
+		      const CompRegion &, compiz::opengl::DirectDrawFramebufferObject *, unsigned int);
 
 	WRAPABLE_HND (7, GLScreenInterface, void, glBufferStencil, const GLMatrix &,
 		      GLVertexBuffer &,

=== added directory 'plugins/opengl/src/fbdirectdraw'
=== added file 'plugins/opengl/src/fbdirectdraw/CMakeLists.txt'
--- plugins/opengl/src/fbdirectdraw/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/opengl/src/fbdirectdraw/CMakeLists.txt	2012-10-02 01:23:21 +0000
@@ -0,0 +1,32 @@
+INCLUDE_DIRECTORIES (  
+  ${COMPIZ_OPENGL_PLUGIN_SOURCE_DIR}
+  ${COMPIZ_OPENGL_PLUGIN_INCLUDE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/src
+    
+  ${Boost_INCLUDE_DIRS}
+)
+
+LINK_DIRECTORIES (${COMPIZ_LIBRARY_DIRS}) 
+
+SET( 
+  SRCS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/framebuffer-direct-draw.cpp
+)
+
+ADD_LIBRARY( 
+  compiz_opengl_framebuffer_direct_draw STATIC
+  
+  ${SRCS}
+)
+
+if (COMPIZ_BUILD_TESTING)
+ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
+endif (COMPIZ_BUILD_TESTING)
+
+TARGET_LINK_LIBRARIES(
+  compiz_opengl_framebuffer_direct_draw
+
+  compiz_region
+  compiz_logmessage
+)

=== added directory 'plugins/opengl/src/fbdirectdraw/include'
=== added file 'plugins/opengl/src/fbdirectdraw/include/framebuffer-direct-draw.h'
--- plugins/opengl/src/fbdirectdraw/include/framebuffer-direct-draw.h	1970-01-01 00:00:00 +0000
+++ plugins/opengl/src/fbdirectdraw/include/framebuffer-direct-draw.h	2012-10-02 01:23:21 +0000
@@ -0,0 +1,103 @@
+/*
+ * Compiz, opengl plugin, FramebufferDirectDraw class
+ *
+ * Copyright (c) 2012 Canonical Ltd.
+ * Authors: Sam Spilsbury <[e-mail]>
+ * 
+ * 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.
+ */
+#ifndef _COMPIZ_OPENGL_FRAMEBUFFER_DIRECT_DRAW_H
+#define _COMPIZ_OPENGL_FRAMEBUFFER_DIRECT_DRAW_H
+
+#include <memory>
+#include <boost/shared_ptr.hpp>
+#include <core/rect.h>
+#include <opengl/framebufferobject.h>
+
+class GLVertexBuffer;
+
+namespace compiz
+{
+    namespace opengl
+    {
+	namespace impl
+	{
+	    namespace cglfb = compiz::opengl;
+
+	    class PrivateDirectDrawFramebufferStrategies;
+
+	    class DirectDrawFramebufferStrategies :
+		public cglfb::DirectDrawFramebufferStrategies
+	    {
+		public:
+
+		    DirectDrawFramebufferStrategies (const FramebufferRectangularDrawStrategyList &strategies);
+
+		    void draw (const CompRect             &src,
+			       const CompRect             &dst,
+			       FramebufferBlitInformation mask,
+			       FramebufferFilter          filter);
+
+		private:
+
+		    std::auto_ptr <PrivateDirectDrawFramebufferStrategies> priv;
+	    };
+
+	    class PrivateDirectDrawFramebufferObject;
+
+	    class DirectDrawFramebufferObject :
+		virtual public cglfb::FramebufferObject,
+		public cglfb::DirectDrawFramebufferObject
+	    {
+		public:
+
+		    DirectDrawFramebufferObject (const boost::shared_ptr <cglfb::DirectDrawFramebufferStrategies> &,
+						 const boost::shared_ptr <cglfb::FramebufferObject>               &);
+
+		    bool allocate (const CompSize &size,
+				   const char *image = NULL,
+				   GLenum format = GL_RGBA,
+				   GLenum type = GL_UNSIGNED_BYTE);
+		    FramebufferObject *bind (compiz::opengl::FramebufferBindPoint bindPoint =
+						compiz::opengl::Draw);
+		    bool checkStatus (compiz::opengl::FramebufferBindPoint bindPoint =
+					compiz::opengl::Draw);
+		    GLTexture * tex ();
+
+		    void directDraw (const CompRect                                 &src,
+				     const CompRect                                 &dst,
+				     compiz::opengl::FramebufferBlitInformation     mask,
+				     compiz::opengl::FramebufferFilter		filter);
+
+		private:
+
+		    PrivateDirectDrawFramebufferObject *priv;
+	    };
+
+	    bool dispatchRectangleDrawStrategyWithPushedReadBuffer (const CompRect                            &src,
+								    const CompRect                            &dst,
+								    GLbitfield                                mask,
+								    GLenum                                    filter,
+								    cglfb::PushableFramebuffer                *pushableFramebuffer,
+								    cglfb::FramebufferRectangularDrawStrategy strategy);
+	}
+    }
+}
+
+#endif

=== added directory 'plugins/opengl/src/fbdirectdraw/src'
=== added file 'plugins/opengl/src/fbdirectdraw/src/framebuffer-direct-draw.cpp'
--- plugins/opengl/src/fbdirectdraw/src/framebuffer-direct-draw.cpp	1970-01-01 00:00:00 +0000
+++ plugins/opengl/src/fbdirectdraw/src/framebuffer-direct-draw.cpp	2012-10-02 01:23:21 +0000
@@ -0,0 +1,159 @@
+/*
+ * Compiz, opengl plugin, DirectDrawFramebufferStrategies class
+ *
+ * Copyright (c) 2012 Canonical Ltd.
+ * Authors: Sam Spilsbury <[e-mail]>
+ * 
+ * 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 "framebuffer-direct-draw.h"
+
+namespace cglfb = compiz::opengl;
+namespace cglfbi = compiz::opengl::impl;
+
+class GLTexture;
+class GLVertexBuffer;
+
+namespace compiz
+{
+    namespace opengl
+    {
+	namespace impl
+	{
+	    class PrivateDirectDrawFramebufferStrategies
+	    {
+		public:
+
+		    PrivateDirectDrawFramebufferStrategies (const cglfb::FramebufferRectangularDrawStrategyList &strategies) :
+			rectangularDrawStrategies (strategies)
+		    {
+		    }
+
+		    cglfb::FramebufferRectangularDrawStrategyList rectangularDrawStrategies;
+	    };
+
+	    class PrivateDirectDrawFramebufferObject
+	    {
+		public:
+
+		    PrivateDirectDrawFramebufferObject (const boost::shared_ptr <cglfb::DirectDrawFramebufferStrategies> &strategies,
+							const boost::shared_ptr <cglfb::FramebufferObject>               &object) :
+			directDrawStrategies (strategies),
+			framebufferObject (object)
+		    {
+		    };
+
+		    boost::shared_ptr <cglfb::DirectDrawFramebufferStrategies> directDrawStrategies;
+		    boost::shared_ptr <cglfb::FramebufferObject>               framebufferObject;
+	    };
+	}
+    }
+}
+
+cglfbi::DirectDrawFramebufferObject::DirectDrawFramebufferObject (const boost::shared_ptr <cglfb::DirectDrawFramebufferStrategies> &strategies,
+								  const boost::shared_ptr <cglfb::FramebufferObject>               &object) :
+    priv (new PrivateDirectDrawFramebufferObject (strategies, object))
+{
+}
+
+bool
+cglfbi::DirectDrawFramebufferObject::allocate (const CompSize &size, const char *image,
+					       GLenum format, GLenum type)
+{
+    return priv->framebufferObject->allocate (size, image, format, type);
+}
+
+cglfb::FramebufferObject *
+cglfbi::DirectDrawFramebufferObject::bind (cglfb::FramebufferBindPoint bindPoint)
+{
+    return priv->framebufferObject->bind (bindPoint);
+}
+
+bool
+cglfbi::DirectDrawFramebufferObject::checkStatus (cglfb::FramebufferBindPoint bindPoint)
+{
+    return priv->framebufferObject->checkStatus (bindPoint);
+}
+
+GLTexture *
+cglfbi::DirectDrawFramebufferObject::tex ()
+{
+    return priv->framebufferObject->tex ();
+}
+
+void
+cglfbi::DirectDrawFramebufferObject::directDraw (const CompRect                    &src,
+						 const CompRect                    &dst,
+						 cglfb::FramebufferBlitInformation mask,
+						 cglfb::FramebufferFilter	   filter)
+{
+    if (!checkStatus ())
+	return;
+
+    priv->directDrawStrategies->draw (src, dst, mask, filter);
+}
+
+bool
+cglfbi::dispatchRectangleDrawStrategyWithPushedReadBuffer (const CompRect                            &src,
+							   const CompRect                            &dst,
+							   GLbitfield                                mask,
+							   GLenum                                    filter,
+							   cglfb::PushableFramebuffer                *pushableFramebuffer,
+							   cglfb::FramebufferRectangularDrawStrategy strategy)
+{
+    bool status = false;
+    /* Bind to the read framebuffer first */
+    pushableFramebuffer->pushFBO (cglfb::Read);
+    status = strategy (src, dst, mask, filter);
+    pushableFramebuffer->popFBO ();
+    return status;
+}
+
+cglfbi::DirectDrawFramebufferStrategies::DirectDrawFramebufferStrategies (const cglfb::FramebufferRectangularDrawStrategyList &strategies) :
+    priv (new PrivateDirectDrawFramebufferStrategies (strategies))
+{
+}
+
+void
+cglfbi::DirectDrawFramebufferStrategies::draw (const CompRect                    &src,
+					       const CompRect                    &dst,
+					       cglfb::FramebufferBlitInformation mask,
+					       cglfb::FramebufferFilter          filter)
+{
+    if (!mask)
+	return;
+
+    const GLbitfield glMask  = (mask & cglfb::ColorData ? GL_COLOR_BUFFER_BIT : 0) |
+			       (mask & cglfb::StencilData ? GL_STENCIL_BUFFER_BIT : 0);
+    const GLenum glFilter = (filter == cglfb::Fast ? GL_NEAREST : GL_LINEAR);
+
+    cglfb::FramebufferRectangularDrawStrategyList::reverse_iterator rit =
+	    priv->rectangularDrawStrategies.rbegin ();
+
+    while (!priv->rectangularDrawStrategies.empty ())
+    {
+	const cglfb::FramebufferRectangularDrawStrategy &strategy = priv->rectangularDrawStrategies.back ();
+
+	/* If one method fails, try the next */
+	if (!strategy (src, dst,  glMask, glFilter))
+	    priv->rectangularDrawStrategies.pop_back ();
+	else
+	    break;
+    }
+}

=== added directory 'plugins/opengl/src/fbdirectdraw/tests'
=== added file 'plugins/opengl/src/fbdirectdraw/tests/CMakeLists.txt'
--- plugins/opengl/src/fbdirectdraw/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/opengl/src/fbdirectdraw/tests/CMakeLists.txt	2012-10-02 01:23:21 +0000
@@ -0,0 +1,24 @@
+find_library (GMOCK_LIBRARY gmock)
+find_library (GMOCK_MAIN_LIBRARY gmock_main)
+
+if (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
+  message ("Google Mock and Google Test not found - cannot build tests!")
+  set (COMPIZ_BUILD_TESTING OFF)
+endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
+
+include_directories (${GTEST_INCLUDE_DIRS})
+
+link_directories (${COMPIZ_LIBRARY_DIRS})
+
+add_executable (compiz_test_opengl_framebuffer_direct_draw
+                ${CMAKE_CURRENT_SOURCE_DIR}/test-opengl-framebuffer-direct-draw.cpp)
+
+target_link_libraries (compiz_test_opengl_framebuffer_direct_draw
+                       compiz_opengl_framebuffer_direct_draw
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+                       )
+
+compiz_discover_tests (compiz_test_opengl_framebuffer_direct_draw COVERAGE compiz_opengl_framebuffer_direct_draw)

=== added file 'plugins/opengl/src/fbdirectdraw/tests/test-opengl-framebuffer-direct-draw.cpp'
--- plugins/opengl/src/fbdirectdraw/tests/test-opengl-framebuffer-direct-draw.cpp	1970-01-01 00:00:00 +0000
+++ plugins/opengl/src/fbdirectdraw/tests/test-opengl-framebuffer-direct-draw.cpp	2012-10-02 01:23:21 +0000
@@ -0,0 +1,219 @@
+/*
+ * Compiz, opengl plugin, DirectDrawFramebufferStrategies class
+ *
+ * Copyright (c) 2012 Canonical Ltd.
+ * Authors: Sam Spilsbury <[e-mail]>
+ * 
+ * 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 <memory>
+#include <boost/function.hpp>
+#include <boost/bind.hpp>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include <opengl/opengl-api.h>
+#include <opengl/framebufferobject.h>
+#include "framebuffer-direct-draw.h"
+
+using ::testing::Return;
+using ::testing::_;
+using ::testing::Expectation;
+using ::testing::StrictMock;
+using ::testing::NiceMock;
+
+namespace cglfb = compiz::opengl;
+namespace cglfbi = compiz::opengl::impl;
+
+namespace
+{
+    class MockFramebufferRectangularDrawStrategy
+    {
+	public:
+
+	    MOCK_METHOD4 (draw, bool (const CompRect &,
+				      const CompRect &,
+				      GLbitfield,
+				      GLenum));
+    };
+
+    class MockPushableFramebuffer :
+	public cglfb::PushableFramebuffer
+    {
+	public:
+
+	    MOCK_METHOD1 (pushFBO, void (cglfb::FramebufferBindPoint));
+	    MOCK_METHOD0 (popFBO, void ());
+    };
+}
+
+class DirectDrawFramebufferStrategiesTest :
+    public ::testing::Test
+{
+    public:
+
+	DirectDrawFramebufferStrategiesTest () :
+	    blitFramebuffer (boost::bind (&MockFramebufferRectangularDrawStrategy::draw, &mpfb, _1, _2, _3, _4)),
+	    rtdraw (boost::bind (&MockFramebufferRectangularDrawStrategy::draw, &mdr,
+				 _1, _2, _3, _4))
+	{
+	}
+
+	void SetUpStrategyList (const cglfb::FramebufferRectangularDrawStrategy &blit,
+				const cglfb::FramebufferRectangularDrawStrategy &draw)
+	{
+	    strategyList.clear ();
+	    strategyList.push_back (draw);
+	    strategyList.push_back (blit);
+	}
+
+	virtual void SetUp ()
+	{   
+	    blitFramebufferWithReadPushed = boost::bind (&cglfbi::dispatchRectangleDrawStrategyWithPushedReadBuffer,
+							 _1, _2, _3, _4,
+							 &mpushable,
+							 blitFramebuffer);
+
+	    SetUpStrategyList (blitFramebuffer, rtdraw);
+	    directDraw.reset (new cglfbi::DirectDrawFramebufferStrategies (strategyList));
+	}
+
+	std::auto_ptr <cglfbi::DirectDrawFramebufferStrategies> directDraw;
+	MockFramebufferRectangularDrawStrategy        mpfb;
+	cglfb::FramebufferRectangularDrawStrategy     blitFramebuffer;
+	cglfb::FramebufferRectangularDrawStrategy     blitFramebufferWithReadPushed;
+	MockFramebufferRectangularDrawStrategy        mdr;
+	StrictMock <MockPushableFramebuffer>          mpushable;
+	cglfb::FramebufferRectangularDrawStrategy     rtdraw;
+	cglfb::FramebufferRectangularDrawStrategyList strategyList;
+
+};
+
+TEST_F (DirectDrawFramebufferStrategiesTest, TestBufferBitsSet)
+{
+    CompRect srcAndDst (0, 0, 0, 0);
+
+    EXPECT_CALL (mpfb, draw (srcAndDst, srcAndDst, GL_COLOR_BUFFER_BIT |
+						   GL_STENCIL_BUFFER_BIT,
+			     _)).WillOnce (Return (true));
+
+    directDraw->draw (srcAndDst,
+		      srcAndDst,
+		      static_cast <cglfb::FramebufferBlitInformation> (cglfb::ColorData | cglfb::StencilData),
+		      cglfb::Good);
+}
+
+TEST_F (DirectDrawFramebufferStrategiesTest, TestBufferNoBitsSet)
+{
+    CompRect srcAndDst (0, 0, 0, 0);
+
+    EXPECT_CALL (mpfb, draw (srcAndDst, srcAndDst, 0,
+			     _)).Times (0);
+
+    directDraw->draw (srcAndDst,
+		      srcAndDst,
+		      static_cast <cglfb::FramebufferBlitInformation> (0),
+		      cglfb::Good);
+}
+
+TEST_F (DirectDrawFramebufferStrategiesTest, TestGoodToLinear)
+{
+    CompRect srcAndDst (0, 0, 0, 0);
+
+    EXPECT_CALL (mpfb, draw (srcAndDst, srcAndDst, _,
+			     GL_LINEAR)).WillOnce (Return (true));
+
+    directDraw->draw (srcAndDst,
+		      srcAndDst,
+		      cglfb::ColorData,
+		      cglfb::Good);
+}
+
+TEST_F (DirectDrawFramebufferStrategiesTest, TestFastToNearest)
+{
+    CompRect srcAndDst (0, 0, 0, 0);
+
+    EXPECT_CALL (mpfb, draw (srcAndDst, srcAndDst, _,
+			     GL_NEAREST)).WillOnce (Return (true));
+
+    directDraw->draw (srcAndDst,
+		      srcAndDst,
+		      cglfb::ColorData,
+		      cglfb::Fast);
+}
+
+TEST_F (DirectDrawFramebufferStrategiesTest, TestRevertToPaintWhenBlitUnavailable)
+{
+    CompRect srcAndDst (0, 0, 0, 0);
+
+    EXPECT_CALL (mpfb, draw (srcAndDst, srcAndDst, _,
+			     _)).WillOnce (Return (false));
+    EXPECT_CALL (mdr, draw (srcAndDst, srcAndDst, _, _));
+
+    directDraw->draw (srcAndDst,
+		      srcAndDst,
+		      cglfb::ColorData,
+		      cglfb::Fast);
+}
+
+TEST_F (DirectDrawFramebufferStrategiesTest, TestRevertOnBlitUnavailablePermanent)
+{
+    StrictMock <MockFramebufferRectangularDrawStrategy> strictMdr;
+    CompRect srcAndDst (0, 0, 0, 0);
+
+    rtdraw = boost::bind (&MockFramebufferRectangularDrawStrategy::draw, &strictMdr, _1, _2, _3, _4);
+
+    SetUpStrategyList (blitFramebuffer, rtdraw);
+    directDraw.reset (new cglfbi::DirectDrawFramebufferStrategies (strategyList));
+
+    EXPECT_CALL (mpfb, draw (srcAndDst, srcAndDst, _, _)).WillOnce (Return (false));
+    ON_CALL (strictMdr, draw (_, _, _, _)).WillByDefault (Return (true));
+    EXPECT_CALL (strictMdr, draw (srcAndDst, srcAndDst, _, _)).Times (2);
+
+    directDraw->draw (srcAndDst,
+		      srcAndDst,
+		      cglfb::ColorData,
+		      cglfb::Fast);
+    directDraw->draw (srcAndDst,
+		      srcAndDst,
+		      cglfb::ColorData,
+		      cglfb::Fast);
+}
+
+TEST_F (DirectDrawFramebufferStrategiesTest, TestPushAndPopReadFramebufferOnBlit)
+{
+    CompRect srcAndDst (0, 0, 0, 0);
+
+    SetUpStrategyList (blitFramebufferWithReadPushed, rtdraw);
+    directDraw.reset (new cglfbi::DirectDrawFramebufferStrategies (strategyList));
+
+    EXPECT_CALL (mpushable, pushFBO (cglfb::Read));
+    EXPECT_CALL (mpfb, draw (srcAndDst, srcAndDst, _, _)).WillOnce (Return (false));
+    EXPECT_CALL (mpushable, popFBO ());
+    ON_CALL (mdr, draw (_, _, _, _)).WillByDefault (Return (true));
+    EXPECT_CALL (mdr, draw (srcAndDst, srcAndDst, _, _)).Times (2);
+
+    directDraw->draw (srcAndDst,
+		      srcAndDst,
+		      cglfb::ColorData,
+		      cglfb::Fast);
+    directDraw->draw (srcAndDst,
+		      srcAndDst,
+		      cglfb::ColorData,
+		      cglfb::Fast);
+}

=== modified file 'plugins/opengl/src/framebufferobject.cpp'
--- plugins/opengl/src/framebufferobject.cpp	2012-08-06 09:44:49 +0000
+++ plugins/opengl/src/framebufferobject.cpp	2012-10-02 01:23:21 +0000
@@ -22,87 +22,135 @@
  *
  * Authors: Pekka Paalanen <[e-mail]>
  */
-
+#include <memory>
 #include <map>
+#include <opengl/opengl.h>
 #include <opengl/framebufferobject.h>
 #include <opengl/texture.h>
 
-struct PrivateGLFramebufferObject
-{
-    PrivateGLFramebufferObject () :
-	fboId (0),
-	pushedId (0),
-	glTex (NULL),
-	status (-1)
-    {
-    }
-
-    void pushFBO ();
-    void popFBO ();
-
-    GLuint fboId;
-    GLuint pushedId;
-    GLuint rbStencilId;
-    GLTexture *glTex;
-
-    GLint status;
-
-    static GLuint boundId;
-    static std::map<GLuint, GLFramebufferObject *> idMap;
-};
-
-GLuint PrivateGLFramebufferObject::boundId = 0;
-std::map<GLuint, GLFramebufferObject *> PrivateGLFramebufferObject::idMap;
+#include "framebuffer-direct-draw.h"
+
+namespace cglfb = compiz::opengl;
+namespace cglfbi = compiz::opengl::impl;
+
+namespace compiz
+{
+    namespace opengl
+    {
+	namespace impl
+	{
+	    struct PrivateGLFramebufferObject :
+		public cglfb::PushableFramebuffer
+	    {
+		PrivateGLFramebufferObject () :
+		    fboId (0),
+		    pushedId (0),
+		    glTex (NULL),
+		    status (-1)
+		{
+		}
+
+		void pushFBO (cglfb::FramebufferBindPoint bindPoint);
+		void popFBO ();
+
+		GLuint fboId;
+		GLuint pushedId;
+		GLuint rbStencilId;
+		GLTexture *glTex;
+
+		GLint status;
+
+		std::auto_ptr <cglfb::DirectDrawFramebufferStrategies> mDirectDraw;
+		GLenum                                                 mBindPoint;
+		GLVertexBuffer                                         *vertexBuffer;
+
+		static GLuint boundId;
+		static std::map<GLuint, cglfbi::FramebufferObject *> idMap;
+	    };
+
+	    GLuint PrivateGLFramebufferObject::boundId = 0;
+	    std::map<GLuint, cglfbi::FramebufferObject *> PrivateGLFramebufferObject::idMap;
+	}
+    }
+}
+
+namespace
+{
+    inline GLenum framebufferBindPointToGLBinding (cglfb::FramebufferBindPoint bindPoint)
+    {
+	static const GLenum bindings[] =
+	{
+	    GL::READ_FRAMEBUFFER,
+	    GL::DRAW_FRAMEBUFFER
+	};
+
+	return bindings[static_cast <int> (bindPoint)];
+    }
+}
 
 void
-PrivateGLFramebufferObject::pushFBO ()
+cglfbi::PrivateGLFramebufferObject::pushFBO (cglfb::FramebufferBindPoint bindPoint)
 {
+    GLenum binding = framebufferBindPointToGLBinding (bindPoint);
+
     pushedId = boundId;
     if (boundId != fboId)
     {
-	(*GL::bindFramebuffer) (GL::FRAMEBUFFER, fboId);
+	mBindPoint = binding;
+	(*GL::bindFramebuffer) (mBindPoint, fboId);
 	boundId = fboId;
     }
 }
 
 void
-PrivateGLFramebufferObject::popFBO ()
+cglfbi::FramebufferObject::popFBO ()
+{
+    priv->popFBO ();
+}
+
+void
+cglfbi::FramebufferObject::pushFBO (cglfb::FramebufferBindPoint bindPoint)
+{
+    priv->pushFBO (bindPoint);
+}
+
+void
+cglfbi::PrivateGLFramebufferObject::popFBO ()
 {
     if (boundId != pushedId)
     {
-	(*GL::bindFramebuffer) (GL::FRAMEBUFFER, pushedId);
+	(*GL::bindFramebuffer) (mBindPoint, pushedId);
 	boundId = pushedId;
     }
 }
 
-GLFramebufferObject::GLFramebufferObject () :
-    priv (new PrivateGLFramebufferObject)
+cglfbi::FramebufferObject::FramebufferObject () :
+    priv (new cglfbi::PrivateGLFramebufferObject ())
 {
     (*GL::genFramebuffers) (1, &priv->fboId);
     (*GL::genRenderbuffers) (1, &priv->rbStencilId);
 
     if (priv->fboId != 0)
-	PrivateGLFramebufferObject::idMap[priv->fboId] = this;
+	cglfbi::PrivateGLFramebufferObject::idMap[priv->fboId] = this;
 }
 
-GLFramebufferObject::~GLFramebufferObject ()
+cglfbi::FramebufferObject::~FramebufferObject ()
 {
     if (priv->glTex)
 	GLTexture::decRef (priv->glTex);
 
-    PrivateGLFramebufferObject::idMap.erase (priv->fboId);
+    cglfbi::PrivateGLFramebufferObject::idMap.erase (priv->fboId);
     (*GL::deleteFramebuffers) (1, &priv->fboId);
     (*GL::deleteRenderbuffers) (1, &priv->rbStencilId);
 
-
     delete priv;
 }
 
 bool
-GLFramebufferObject::allocate (const CompSize &size, const char *image,
-			       GLenum format, GLenum type)
+cglfbi::FramebufferObject::allocate (const CompSize &size, const char *image,
+				     GLenum format, GLenum type)
 {
-    priv->status = -1;
+    priv->status = 0;
 
     if (!priv->glTex ||
         size.width () != priv->glTex->width () ||
@@ -127,53 +175,59 @@
 	}
     }
 
-    priv->pushFBO ();
+    priv->pushFBO (cglfb::Draw);
 
-    (*GL::framebufferTexture2D) (GL::FRAMEBUFFER, GL::COLOR_ATTACHMENT0,
+    (*GL::framebufferTexture2D) (priv->mBindPoint, GL::COLOR_ATTACHMENT0,
                                  priv->glTex->target (),
                                  priv->glTex->name (), 0);
 
-    priv->status = (*GL::checkFramebufferStatus) (GL::DRAW_FRAMEBUFFER);
+    priv->status = (*GL::checkFramebufferStatus) (priv->mBindPoint);
 
     priv->popFBO ();
     return true;
 }
 
-GLFramebufferObject *
-GLFramebufferObject::bind ()
+cglfbi::FramebufferObject *
+cglfbi::FramebufferObject::bind (cglfb::FramebufferBindPoint bindPoint)
 {
-    GLFramebufferObject *old = NULL;
+    const GLenum binding = framebufferBindPointToGLBinding (bindPoint);
+
+    cglfbi::FramebufferObject *old = NULL;
 
     if (priv->boundId != 0)
     {
-	std::map<GLuint, GLFramebufferObject *>::iterator it;
-	it = PrivateGLFramebufferObject::idMap.find (priv->boundId);
+	std::map<GLuint, cglfbi::FramebufferObject *>::iterator it;
+	it = cglfbi::PrivateGLFramebufferObject::idMap.find (priv->boundId);
 
-	if (it != PrivateGLFramebufferObject::idMap.end ())
+	if (it != cglfbi::PrivateGLFramebufferObject::idMap.end ())
 	    old = it->second;
 	else
 	    compLogMessage ("opengl", CompLogLevelError,
 		"An FBO without GLFramebufferObject cannot be restored");
     }
 
-    (*GL::bindFramebuffer) (GL::FRAMEBUFFER, priv->fboId);
+    priv->mBindPoint = binding;
+
+    (*GL::bindFramebuffer) (priv->mBindPoint, priv->fboId);
     priv->boundId = priv->fboId;
 
-    (*GL::framebufferRenderbuffer) (GL::FRAMEBUFFER, GL::DEPTH_ATTACHMENT, GL::RENDERBUFFER, priv->rbStencilId);
-    (*GL::framebufferRenderbuffer) (GL::FRAMEBUFFER, GL::STENCIL_ATTACHMENT, GL::RENDERBUFFER, priv->rbStencilId);
-
+    (*GL::framebufferRenderbuffer) (priv->mBindPoint, GL::DEPTH_ATTACHMENT, GL::RENDERBUFFER, priv->rbStencilId);
+    (*GL::framebufferRenderbuffer) (priv->mBindPoint, GL::STENCIL_ATTACHMENT, GL::RENDERBUFFER, priv->rbStencilId);
     return old;
 }
 
 // static
 void
-GLFramebufferObject::rebind (GLFramebufferObject *fbo)
+cglfbi::FramebufferObject::rebind (cglfbi::FramebufferObject *fbo,
+				   cglfb::FramebufferBindPoint bindPoint)
 {
     GLuint id = fbo ? fbo->priv->fboId : 0;
+    const GLenum binding = fbo ? fbo->priv->mBindPoint :
+				 framebufferBindPointToGLBinding (bindPoint);
 
     if (id != fbo->priv->boundId)
     {
-	(*GL::bindFramebuffer) (GL::FRAMEBUFFER, id);
+	(*GL::bindFramebuffer) (binding, id);
 	fbo->priv->boundId = id;
     }
 }
@@ -199,11 +253,16 @@
 }
 
 bool
-GLFramebufferObject::checkStatus ()
+cglfbi::FramebufferObject::checkStatus (cglfb::FramebufferBindPoint bindPoint)
 {
-    priv->pushFBO ();
-    priv-> status = (*GL::checkFramebufferStatus) (GL_FRAMEBUFFER);
-    priv->popFBO ();
+    const GLenum binding = framebufferBindPointToGLBinding (bindPoint);
+
+    if (!priv->status)
+    {
+	priv->pushFBO (bindPoint);
+	priv->status = (*GL::checkFramebufferStatus) (binding);
+	priv->popFBO ();
+    }
 
     if (priv->status == static_cast <GLint> (GL::FRAMEBUFFER_COMPLETE))
 	return true;
@@ -215,7 +274,7 @@
 }
 
 GLTexture *
-GLFramebufferObject::tex ()
+cglfbi::FramebufferObject::tex ()
 {
     return priv->glTex;
 }

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2012-09-21 06:05:27 +0000
+++ plugins/opengl/src/paint.cpp	2012-10-02 01:23:21 +0000
@@ -44,6 +44,7 @@
 #define DEG2RAD (M_PI / 180.0f)
 
 using namespace compiz::opengl;
+namespace cglfb = compiz::opengl;
 
 GLScreenPaintAttrib defaultScreenPaintAttrib = {
     0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -DEFAULT_Z_CAMERA
@@ -650,91 +651,16 @@
 }
 
 void
-GLScreen::glPaintCompositedOutput (const CompRegion    &region,
-				   GLFramebufferObject *fbo,
-				   unsigned int         mask)
+GLScreen::glPaintCompositedOutput (const CompRegion			       &region,
+				   compiz::opengl::DirectDrawFramebufferObject *fbo,
+				   unsigned int				       mask)
 {
     WRAPABLE_HND_FUNCTN (glPaintCompositedOutput, region, fbo, mask)
 
-    GLMatrix sTransform;
-    std::vector<GLfloat> vertexData;
-    std::vector<GLfloat> textureData;
-    const GLTexture::Matrix & texmatrix = fbo->tex ()->matrix ();
-    GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
-
-    streamingBuffer->begin (GL_TRIANGLES);
-
-    if (mask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK)
-    {
-	GLfloat tx1 = COMP_TEX_COORD_X (texmatrix, 0.0f);
-	GLfloat tx2 = COMP_TEX_COORD_X (texmatrix, screen->width ());
-	GLfloat ty1 = 1.0 - COMP_TEX_COORD_Y (texmatrix, 0.0f);
-	GLfloat ty2 = 1.0 - COMP_TEX_COORD_Y (texmatrix, screen->height ());
-
-	vertexData = {
-	    0.0f,                    0.0f,                     0.0f,
-	    0.0f,                    (float)screen->height (), 0.0f,
-	    (float)screen->width (), 0.0f,                     0.0f,
-
-	    0.0f,                    (float)screen->height (), 0.0f,
-	    (float)screen->width (), (float)screen->height (), 0.0f,
-	    (float)screen->width (), 0.0f,                     0.0f,
-	};
-
-	textureData = {
-	    tx1, ty1,
-	    tx1, ty2,
-	    tx2, ty1,
-	    tx1, ty2,
-	    tx2, ty2,
-	    tx2, ty1,
-	};
-
-	streamingBuffer->addVertices (6, &vertexData[0]);
-	streamingBuffer->addTexCoords (0, 6, &textureData[0]);
-    }
-    else
-    {
-	BoxPtr pBox = const_cast <Region> (region.handle ())->rects;
-	int nBox = const_cast <Region> (region.handle ())->numRects;
-
-	while (nBox--)
-	{
-	    GLfloat tx1 = COMP_TEX_COORD_X (texmatrix, pBox->x1);
-	    GLfloat tx2 = COMP_TEX_COORD_X (texmatrix, pBox->x2);
-	    GLfloat ty1 = 1.0 - COMP_TEX_COORD_Y (texmatrix, pBox->y1);
-	    GLfloat ty2 = 1.0 - COMP_TEX_COORD_Y (texmatrix, pBox->y2);
-
-	    vertexData = {
-		(float)pBox->x1, (float)pBox->y1, 0.0f,
-		(float)pBox->x1, (float)pBox->y2, 0.0f,
-		(float)pBox->x2, (float)pBox->y1, 0.0f,
-
-		(float)pBox->x1, (float)pBox->y2, 0.0f,
-		(float)pBox->x2, (float)pBox->y2, 0.0f,
-		(float)pBox->x2, (float)pBox->y1, 0.0f,
-	    };
-
-	    textureData = {
-		tx1, ty1,
-		tx1, ty2,
-		tx2, ty1,
-		tx1, ty2,
-		tx2, ty2,
-		tx2, ty1,
-	    };
-
-	    streamingBuffer->addVertices (6, &vertexData[0]);
-	    streamingBuffer->addTexCoords (0, 6, &textureData[0]);
-	    pBox++;
-	}
-    }
-
-    streamingBuffer->end ();
-    fbo->tex ()->enable (GLTexture::Fast);
-    sTransform.toScreenSpace (&screen->fullscreenOutput (), -DEFAULT_Z_CAMERA);
-    streamingBuffer->render (sTransform);
-    fbo->tex ()->disable ();
+    /* Draw every rect individually, this could be a little slow
+     * for lots of rects, but the general usecase isn't that */
+    foreach (const CompRect &r, region.rects ())
+	fbo->directDraw (r, r, cglfb::ColorData, cglfb::Fast);
 }
 
 static void

=== modified file 'plugins/opengl/src/privates.h'
--- plugins/opengl/src/privates.h	2012-09-25 10:47:39 +0000
+++ plugins/opengl/src/privates.h	2012-10-02 01:23:21 +0000
@@ -28,20 +28,28 @@
 #ifndef _OPENGL_PRIVATES_H
 #define _OPENGL_PRIVATES_H
 
+#include <memory>
 #include <composite/composite.h>
 #include <opengl/opengl.h>
 #include <core/atoms.h>
-
-#ifdef USE_GLES
 #include <opengl/framebufferobject.h>
-#endif
-
 #include <opengl/doublebuffer.h>
 
 #include "privatetexture.h"
 #include "privatevertexbuffer.h"
 #include "opengl_options.h"
 
+namespace compiz
+{
+    namespace opengl
+    {
+	namespace impl
+	{
+	    class DirectDrawFramebufferObject;
+	}
+    }
+}
+
 extern CompOutput *targetOutput;
 
 class GLDoubleBuffer :
@@ -81,6 +89,17 @@
 	Window mOutput;
 };
 
+namespace compiz
+{
+    namespace opengl
+    {
+	bool blitFramebufferGLX (const CompRect &src,
+				 const CompRect &dst,
+				 GLbitfield     mask,
+				 GLenum         filter);
+    }
+}
+
 #else
 
 class EGLDoubleBuffer :
@@ -104,6 +123,17 @@
 	EGLSurface const & mSurface;
 };
 
+namespace compiz
+{
+    namespace opengl
+    {
+	bool blitFramebufferEGL (const CompRect &src,
+				 const CompRect &dst,
+				 GLbitfield     mask,
+				 GLenum         filter);
+    }
+}
+
 #endif
 
 class GLIcon
@@ -190,8 +220,9 @@
 	GLXDoubleBuffer doubleBuffer;
 	#endif
 
-	GLFramebufferObject *scratchFbo;
-	CompRegion outputRegion;
+	std::auto_ptr <compiz::opengl::impl::DirectDrawFramebufferObject> scratchFbo;
+	compiz::opengl::BlitFramebufferFunc		                  blitFramebuffer;
+	CompRegion					                  outputRegion;
 
 	XRectangle lastViewport;
 	bool refreshSubBuffer;

=== modified file 'plugins/opengl/src/screen.cpp'
--- plugins/opengl/src/screen.cpp	2012-09-26 07:58:17 +0000
+++ plugins/opengl/src/screen.cpp	2012-10-02 01:23:21 +0000
@@ -32,12 +32,35 @@
 #endif
 #include <errno.h>
 
+#include <boost/make_shared.hpp>
+
 #include "privates.h"
+#include "framebuffer-direct-draw.h"
 
 #include <dlfcn.h>
 #include <math.h>
 
 using namespace compiz::opengl;
+namespace cglfb = compiz::opengl;
+namespace cgli = compiz::opengl::impl;
+
+namespace compiz
+{
+    namespace opengl
+    {
+#ifndef USE_GLES
+	bool blitFramebufferGLX (const CompRect &src,
+				 const CompRect &dst,
+				 GLbitfield     mask,
+				 GLenum         filter);
+#else
+	bool blitFramebufferEGL (const CompRect &src,
+				 const CompRect &dst,
+				 GLbitfield     mask,
+				 GLenum         filter);
+#endif
+    }
+}
 
 namespace GL {
     #ifdef USE_GLES
@@ -135,11 +158,12 @@
     GLDisableVertexAttribArrayProc disableVertexAttribArray = NULL;
     GLVertexAttribPointerProc      vertexAttribPointer = NULL;
 
-    GLGenRenderbuffersProc genRenderbuffers = NULL;
-    GLDeleteRenderbuffersProc deleteRenderbuffers = NULL;
+    GLGenRenderbuffersProc        genRenderbuffers = NULL;
+    GLDeleteRenderbuffersProc     deleteRenderbuffers = NULL;
     GLFramebufferRenderbufferProc framebufferRenderbuffer = NULL;
-    GLBindRenderbufferProc bindRenderbuffer = NULL;
-    GLRenderbufferStorageProc renderbufferStorage = NULL;
+    GLBindRenderbufferProc        bindRenderbuffer = NULL;
+    GLRenderbufferStorageProc     renderbufferStorage = NULL;
+    GLBlitFramebufferProc         blitFramebuffer = NULL;
 
     bool  textureFromPixmap = true;
     bool  textureRectangle = false;
@@ -271,6 +295,89 @@
     GLScreen *gScreen;
 };
 
+namespace
+{
+    bool defaultRectangularFramebufferDraw (GLVertexBuffer       *vertexBuffer,
+					    GLFramebufferObject  *fbo,
+					    const CompRect       &src,
+					    const CompRect       &dst,
+					    GLbitfield           mask,
+					    GLenum               filter)
+    {
+	GLTexture *texture = fbo->tex ();
+	GLMatrix sTransform;
+	const GLTexture::Matrix & texmatrix = texture->matrix ();
+	const GLfloat tx1 = COMP_TEX_COORD_X (texmatrix, src.x1 ());
+	const GLfloat tx2 = COMP_TEX_COORD_X (texmatrix, src.x2 ());
+	const GLfloat ty1 = 1.0 - COMP_TEX_COORD_Y (texmatrix, src.y1 ());
+	const GLfloat ty2 = 1.0 - COMP_TEX_COORD_Y (texmatrix, src.y2 ());
+
+	const GLfloat vx1 = src.x1 ();
+	const GLfloat vx2 = src.x2 ();
+	const GLfloat vy1 = src.y1 ();
+	const GLfloat vy2 = src.y2 ();
+
+	const GLTexture::Filter texFilter =
+	    (filter == GL_LINEAR) ? GLTexture::Good :
+				    GLTexture::Fast;
+
+	std::vector<GLfloat> vertexData = {
+	    vx1, vy1, 0.0f,
+	    vx1, vy2, 0.0f,
+	    vx2, vy1, 0.0f,
+
+	    vx1, vy2, 0.0f,
+	    vx2, vy2, 0.0f,
+	    vx2, vy1, 0.0f,
+	};
+
+	std::vector<GLfloat> textureData = {
+	    tx1, ty1,
+	    tx1, ty2,
+	    tx2, ty1,
+	    tx1, ty2,
+	    tx2, ty2,
+	    tx2, ty1,
+	};
+
+	vertexBuffer->begin (GL_TRIANGLES);
+	vertexBuffer->addVertices (6, &vertexData[0]);
+	vertexBuffer->addTexCoords (0, 6, &textureData[0]);
+
+	if (vertexBuffer->end ())
+	{
+	    texture->enable (texFilter);
+	    sTransform.toScreenSpace (&screen->fullscreenOutput (), -DEFAULT_Z_CAMERA);
+	    vertexBuffer->render (sTransform);
+	    texture->disable ();
+	}
+
+	return true;
+    }
+
+    void initializeDirectDraw (boost::shared_ptr <cgli::DirectDrawFramebufferStrategies> &directDraw,
+			       const compiz::opengl::FramebufferRectangularDrawStrategy  &blitFramebuffer,
+			       const compiz::opengl::FramebufferRectangularDrawStrategy  &rectangularTextureDraw,
+			       cglfb::PushableFramebuffer                                *pushable)
+    {
+	cglfb::FramebufferRectangularDrawStrategy blitFramebufferWithPush (
+								    boost::bind (
+									cgli::dispatchRectangleDrawStrategyWithPushedReadBuffer,
+									_1, _2, _3, _4,
+									pushable,
+									blitFramebuffer));
+
+	/* Tries each of these from back to front */
+	cglfb::FramebufferRectangularDrawStrategyList strategies =
+	{
+	    rectangularTextureDraw,
+	    blitFramebufferWithPush
+	};
+
+	directDraw.reset (new cgli::DirectDrawFramebufferStrategies (strategies));
+    }
+}
+
 bool
 GLScreen::glInitContext (XVisualInfo *visinfo)
 {
@@ -500,6 +607,7 @@
     if (GL::textureFromPixmap)
 	registerBindPixmap (EglTexture::bindPixmapToTexture);
 
+    priv->blitFramebuffer = boost::bind (compiz::opengl::blitFramebufferEGL, _1, _2, _3, _4);
     priv->incorrectRefreshRate = false;
 
     #else
@@ -684,6 +792,10 @@
 	    GL::fboSupported = true;
     }
 
+    if (GL::fboSupported &&
+        strstr (glExtensions, "GL_EXT_framebuffer_blit"))
+	GL::blitFramebuffer = (GL::GLBlitFramebufferProc) getProcAddress ("glBlitFramebufferEXT");
+
     GL::fboStencilSupported = GL::fboSupported &&
         strstr (glExtensions, "GL_EXT_packed_depth_stencil");
 
@@ -809,11 +921,24 @@
 
     if (GL::textureFromPixmap)
 	registerBindPixmap (TfpTexture::bindPixmapToTexture);
+
+    priv->blitFramebuffer = boost::bind (compiz::opengl::blitFramebufferGLX, _1, _2, _3, _4);
 #endif
 
     if (GL::fboSupported)
     {
-	priv->scratchFbo = new GLFramebufferObject;
+	boost::shared_ptr <cgli::DirectDrawFramebufferStrategies> directDraw;
+	boost::shared_ptr <cgli::FramebufferObject> fbo (boost::make_shared <cgli::FramebufferObject> ());
+	cglfb::FramebufferRectangularDrawStrategy rectangularTextureDraw (boost::bind (defaultRectangularFramebufferDraw,
+										       GLVertexBuffer::streamingBuffer (),
+										       fbo.get (),
+										       _1, _2, _3, _4));
+	initializeDirectDraw (directDraw,
+			      priv->blitFramebuffer,
+			      rectangularTextureDraw,
+			      fbo.get ());
+	priv->scratchFbo.reset (new cgli::DirectDrawFramebufferObject (directDraw,
+								       fbo));
 	priv->scratchFbo->allocate (*screen, NULL, GL_BGRA);
     }
 
@@ -1117,9 +1242,6 @@
 	glXDestroyContext (screen->dpy (), priv->ctx);
     #endif
 
-    if (priv->scratchFbo)
-	delete priv->scratchFbo;
-
     delete priv;
 }
 
@@ -1142,6 +1264,7 @@
     doubleBuffer (screen->dpy (), *screen, surface),
     #endif
     scratchFbo (NULL),
+    blitFramebuffer (),
     outputRegion (),
     lastMask (0),
     bindPixmap (),
@@ -1343,7 +1466,7 @@
 {
     screen->outputChangeNotify ();
 
-    if (scratchFbo)
+    if (scratchFbo.get ())
 	scratchFbo->allocate (*screen, NULL, GL_BGRA);
     updateView ();
 }
@@ -1570,9 +1693,9 @@
     WRAPABLE_DEF (projectionMatrix)
 
 void
-GLScreenInterface::glPaintCompositedOutput (const CompRegion    &region,
-					    GLFramebufferObject *fbo,
-					    unsigned int         mask)
+GLScreenInterface::glPaintCompositedOutput (const CompRegion				&region,
+					    compiz::opengl::DirectDrawFramebufferObject *fbo,
+					    unsigned int				mask)
     WRAPABLE_DEF (glPaintCompositedOutput, region, fbo, mask)
 
 void
@@ -1875,6 +1998,29 @@
 
 }
 
+bool
+cglfb::blitFramebufferGLX (const CompRect &src,
+			   const CompRect &dst,
+			   GLbitfield     mask,
+			   GLenum         filter)
+{
+    /* Must have GL_EXT_blit_framebuffer */
+    if (!GL::blitFramebuffer)
+	return false;
+
+    (*GL::blitFramebuffer) (src.x1 (), // sx0
+			    src.y1 (), // sy0
+			    src.x2 (), // sx1
+			    src.y2 (), // sy1
+			    dst.x1 (), // dx0
+			    dst.y1 (), // dy0
+			    dst.x2 (), // dx1,
+			    dst.y2 (), // dy1
+			    GL_COLOR_BUFFER_BIT,
+			    GL_LINEAR);
+    return true;
+}
+
 #else
 
 EGLDoubleBuffer::EGLDoubleBuffer (Display *d,
@@ -1940,6 +2086,16 @@
 {
 }
 
+bool
+cglfb::blitFramebufferEGL (const CompRect &src,
+			   const CompRect &dst,
+			   GLbitfield     mask,
+			   GLenum         filter)
+{
+    /* Not supported on OpenGL|ES2 */
+    return false;
+}
+
 #endif
 
 void
@@ -1964,9 +2120,9 @@
     bool useFbo = false;
 
     /* Clear the color buffer where appropriate */
-    if (GL::fboEnabled && scratchFbo)
+    if (GL::fboEnabled && scratchFbo.get ())
     {
-	oldFbo = scratchFbo->bind ();
+	oldFbo = static_cast <GLFramebufferObject *> (scratchFbo->bind ());
 	useFbo = scratchFbo->checkStatus () && scratchFbo->tex ();
 	if (!useFbo)
 	    GLFramebufferObject::rebind (oldFbo);
@@ -2066,10 +2222,7 @@
     if (useFbo)
     {
 	GLFramebufferObject::rebind (oldFbo);
-
-	// FIXME: does not work if screen dimensions exceed max texture size
-	//        We should try to use glBlitFramebuffer instead.
-	gScreen->glPaintCompositedOutput (screen->region (), scratchFbo, mask);
+	gScreen->glPaintCompositedOutput (screen->region (), scratchFbo.get (), mask);
     }
 
     if (cScreen->outputWindowChanged ())
@@ -2163,10 +2316,16 @@
     }
 }
 
-GLFramebufferObject *
+compiz::opengl::FramebufferObject *
 GLScreen::fbo ()
 {
-    return priv->scratchFbo;
+    return priv->scratchFbo.get ();
+}
+
+const cglfb::BlitFramebufferFunc &
+GLScreen::blitFramebufferFunc()
+{
+    return priv->blitFramebuffer;
 }
 
 GLTexture *

=== modified file 'plugins/water/src/water.cpp'
--- plugins/water/src/water.cpp	2012-09-08 00:00:34 +0000
+++ plugins/water/src/water.cpp	2012-10-02 01:23:21 +0000
@@ -318,9 +318,9 @@
 }
 
 void
-WaterScreen::glPaintCompositedOutput (const CompRegion    &region,
-                                      GLFramebufferObject *fbo,
-                                      unsigned int         mask)
+WaterScreen::glPaintCompositedOutput (const CompRegion				  &region,
+				      compiz::opengl::DirectDrawFramebufferObject *fbo,
+				      unsigned int				  mask)
 {
     if (count)
     {

=== modified file 'plugins/water/src/water.h'
--- plugins/water/src/water.h	2012-09-07 23:56:21 +0000
+++ plugins/water/src/water.h	2012-10-02 01:23:21 +0000
@@ -64,9 +64,9 @@
 
 	void handleEvent (XEvent *);
 
-	void glPaintCompositedOutput (const CompRegion    &region,
-				      GLFramebufferObject *fbo,
-				      unsigned int         mask);
+	void glPaintCompositedOutput (const CompRegion				  &region,
+				      compiz::opengl::DirectDrawFramebufferObject *fbo,
+				      unsigned int				  mask);
 	void preparePaint (int);
 	void donePaint ();