Merge lp:~mc-return/compiz/compiz.merge-opengl-cleanup into lp:compiz/0.9.11

[MC Return]

*OpenGL plugin, cleanup:

Bail out of functions ASAP, do not calculate stuff you might not need.
Merged if condition checks.
Use pre- instead of postfix de- and increments.
Declare variables outside of loops.
Declarations and assignment of local variables in one line.
Removed redundant brackets.
Removed and added newlines for better readability.
Fixed indentation.
Fixed a few typos in comments and debug-messages.
Added TODO comment.

*OpenGL plugin, fixes:

framebufferobject.cpp:
Also initialize the non-static struct member "rbStencilId" in the
PrivateGLFramebufferObject::PrivateGLFramebufferObject () constructor
(LP: #1101410)

screen.cpp:
Initialize all the non-static class member fields (glxPixmapFBConfigs,
lastViewport) and members (filter, saveWindow) in the PrivateGLScreen::
PrivateGLScreen (GLScreen *) constructor.
(LP: #1101408)

texture.cpp:
Also initialize the non-static class members "x11Pixmap" and "source" in
the TfpTexture::TfpTexture () ctor.
(LP: #1101594)

vertexbuffer.cpp:
Also initialize the non-static class members "color", "primitiveType" and
"usage" in the PrivateVertexBuffer::PrivateVertexBuffer () constructor
(LP: #1101493)

Unmerged revisions

3688. By MC Return on 2013-07-21

Merged latest lp:compiz

3687. By MC Return on 2013-07-07

Merged latest lp:compiz and fixed conflict in plugins/opengl/src/paint.cpp

3686. By MC Return on 2013-07-07

framebufferobject.cpp:
Also initialize the non-static struct member "rbStencilId" in the
PrivateGLFramebufferObject::PrivateGLFramebufferObject () constructor
(LP: #1101410)

Removed alignment in the ctor

3685. By MC Return on 2013-07-07

screen.cpp:
Initialize all the non-static class member fields (glxPixmapFBConfigs,
lastViewport) and members (filter, saveWindow) in the PrivateGLScreen::
PrivateGLScreen (GLScreen *) constructor
(LP: #1101408)

Reverted alignment in the constructor

3684. By MC Return on 2013-07-07

Also initialize the non-static class members "color", "primitiveType" and
"usage" in the PrivateVertexBuffer::PrivateVertexBuffer () constructor
(LP: #1101493)

3683. By MC Return on 2013-07-07

texture.cpp:
Also initialize the non-static class members "x11Pixmap" and "source" in
the TfpTexture::TfpTexture () ctor (LP: #1101594)

3682. By MC Return on 2013-06-28

Indentation fixes
Re-added "lost" code in paint.cpp

3681. By MC Return on 2013-06-28

Removed bracket (typo)

3680. By MC Return on 2013-06-28

Merged latest lp:compiz and fixed conflict in plugins/opengl/src/window.cpp

3679. By MC Return on 2013-06-28

Added missing " | NoOcclusionDetection"

=== modified file 'plugins/opengl/include/opengl/doublebuffer.h'
--- plugins/opengl/include/opengl/doublebuffer.h	2012-11-08 09:17:39 +0000
+++ plugins/opengl/include/opengl/doublebuffer.h	2013-07-24 16:05:45 +0000
@@ -18,16 +18,17 @@
 class DoubleBuffer
 {
     public:
+
 	DoubleBuffer (const impl::GLXSwapIntervalEXTFunc  &swapIntervalFunc,
 		      const impl::GLXWaitVideoSyncSGIFunc &waitVideoSyncFunc);
 	virtual ~DoubleBuffer ();
 
-	virtual void swap () const = 0;
-	virtual bool blitAvailable () const = 0;
-	virtual void blit (const CompRegion &region) const = 0;
-	virtual bool fallbackBlitAvailable () const = 0;
+	virtual void swap () const                                 = 0;
+	virtual bool blitAvailable () const                        = 0;
+	virtual void blit (const CompRegion &region) const         = 0;
+	virtual bool fallbackBlitAvailable () const                = 0;
 	virtual void fallbackBlit (const CompRegion &region) const = 0;
-	virtual void copyFrontToBack () const = 0;
+	virtual void copyFrontToBack () const                      = 0;
 
 	typedef enum
 	{
@@ -56,13 +57,18 @@
 	    FrameThrottledInternally
 	} FrameThrottleState;
 
-	void set (Setting name, bool value);
-	void render (const CompRegion &region, bool fullscreen);
+	void set (Setting name,
+		  bool    value);
+
+	void render (const CompRegion &region,
+		     bool             fullscreen);
+
 	void vsync (FrontbufferRedrawType redrawType);
 
 	bool hardwareVSyncFunctional ();
 
     protected:
+
 	bool setting[_NSETTINGS];
 
     private:
@@ -72,7 +78,7 @@
 	virtual bool enableBlockingVideoSync (FrontbufferRedrawType, FrameThrottleState &);
 	virtual void disableBlockingVideoSync ();
 
-	SyncType		      syncType;
+	SyncType                      syncType;
 
 	FrameThrottleState            bufferFrameThrottleState;
 	unsigned int                  blockingVSyncUnthrottledFrames;
 
=== modified file 'plugins/opengl/include/opengl/opengl.h'
--- plugins/opengl/include/opengl/opengl.h	2013-04-27 05:54:57 +0000
+++ plugins/opengl/include/opengl/opengl.h	2013-07-24 16:05:45 +0000
@@ -87,77 +87,79 @@
 class PrivateGLScreen;
 class PrivateGLWindow;
 
-extern GLushort   defaultColor[4];
+extern GLushort    defaultColor[4];
 
 #ifndef GLX_EXT_texture_from_pixmap
-#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
-#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
-#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
-#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
-#define GLX_Y_INVERTED_EXT                 0x20D4
-#define GLX_TEXTURE_FORMAT_EXT             0x20D5
-#define GLX_TEXTURE_TARGET_EXT             0x20D6
-#define GLX_MIPMAP_TEXTURE_EXT             0x20D7
-#define GLX_TEXTURE_FORMAT_NONE_EXT        0x20D8
-#define GLX_TEXTURE_FORMAT_RGB_EXT         0x20D9
-#define GLX_TEXTURE_FORMAT_RGBA_EXT        0x20DA
-#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
-#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
-#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
-#define GLX_TEXTURE_1D_EXT                 0x20DB
-#define GLX_TEXTURE_2D_EXT                 0x20DC
-#define GLX_TEXTURE_RECTANGLE_EXT          0x20DD
-#define GLX_FRONT_LEFT_EXT                 0x20DE
+#define GLX_BIND_TO_TEXTURE_RGB_EXT     0x20D0
+#define GLX_BIND_TO_TEXTURE_RGBA_EXT    0x20D1
+#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT  0x20D2
+#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3
+#define GLX_Y_INVERTED_EXT              0x20D4
+#define GLX_TEXTURE_FORMAT_EXT          0x20D5
+#define GLX_TEXTURE_TARGET_EXT          0x20D6
+#define GLX_MIPMAP_TEXTURE_EXT          0x20D7
+#define GLX_TEXTURE_FORMAT_NONE_EXT     0x20D8
+#define GLX_TEXTURE_FORMAT_RGB_EXT      0x20D9
+#define GLX_TEXTURE_FORMAT_RGBA_EXT     0x20DA
+#define GLX_TEXTURE_1D_BIT_EXT          0x00000001
+#define GLX_TEXTURE_2D_BIT_EXT          0x00000002
+#define GLX_TEXTURE_RECTANGLE_BIT_EXT   0x00000004
+#define GLX_TEXTURE_1D_EXT              0x20DB
+#define GLX_TEXTURE_2D_EXT              0x20DC
+#define GLX_TEXTURE_RECTANGLE_EXT       0x20DD
+#define GLX_FRONT_LEFT_EXT              0x20DE
 #endif
 
-namespace GL {
+namespace GL
+{
     #ifdef USE_GLES
-    typedef EGLImageKHR (*EGLCreateImageKHRProc)  (EGLDisplay dpy,
-                                                   EGLContext ctx,
-                                                   EGLenum target,
-                                                   EGLClientBuffer buffer,
-                                                   const EGLint *attrib_list);
-    typedef EGLBoolean  (*EGLDestroyImageKHRProc) (EGLDisplay dpy,
-                                                   EGLImageKHR image);
-
-    typedef void (*GLEGLImageTargetTexture2DOESProc) (GLenum target,
-                                                      GLeglImageOES image);
-
-    typedef EGLBoolean (*EGLPostSubBufferNVProc) (EGLDisplay dpy,
-						  EGLSurface surface,
-						  EGLint x, EGLint y,
-						  EGLint width, EGLint height);
-
+typedef EGLImageKHR (*EGLCreateImageKHRProc)  (EGLDisplay      dpy,
+					       EGLContext      ctx,
+					       EGLenum         target,
+					       EGLClientBuffer buffer,
+					       const EGLint    *attrib_list);
+
+typedef EGLBoolean  (*EGLDestroyImageKHRProc) (EGLDisplay  dpy,
+					       EGLImageKHR image);
+
+typedef void (*GLEGLImageTargetTexture2DOESProc) (GLenum        target,
+						  GLeglImageOES image);
+
+typedef EGLBoolean (*EGLPostSubBufferNVProc) (EGLDisplay dpy,
+					      EGLSurface surface,
+					      EGLint     x,
+					      EGLint     y,
+					      EGLint     width,
+					      EGLint     height);
     #else
     typedef void (*FuncPtr) (void);
 
     typedef FuncPtr (*GLXGetProcAddressProc) (const GLubyte *procName);
 
-    typedef void    (*GLXBindTexImageProc)    (Display	 *display,
-					       GLXDrawable	 drawable,
-					       int		 buffer,
-					       int		 *attribList);
-    typedef void    (*GLXReleaseTexImageProc) (Display	 *display,
-					       GLXDrawable	 drawable,
-					       int		 buffer);
-    typedef void    (*GLXQueryDrawableProc)   (Display	 *display,
-					       GLXDrawable	 drawable,
-					       int		 attribute,
-					       unsigned int  *value);
-
-    typedef void (*GLXCopySubBufferProc) (Display     *display,
-					  GLXDrawable drawable,
-					  int	  x,
-					  int	  y,
-					  int	  width,
-					  int	  height);
-
-    typedef int (*GLXGetVideoSyncProc)  (unsigned int *count);
-    typedef int (*GLXWaitVideoSyncProc) (int	  divisor,
-					 int	  remainder,
-					 unsigned int *count);
-    typedef int (*GLXSwapIntervalProc) (int interval);
-
+typedef void    (*GLXBindTexImageProc)    (Display	 *display,
+					   GLXDrawable	 drawable,
+					   int		 buffer,
+					   int		 *attribList);
+typedef void    (*GLXReleaseTexImageProc) (Display	 *display,
+					   GLXDrawable	 drawable,
+					   int		 buffer);
+typedef void    (*GLXQueryDrawableProc)   (Display	 *display,
+					   GLXDrawable	 drawable,
+					   int		 attribute,
+					   unsigned int  *value);
+
+typedef void (*GLXCopySubBufferProc) (Display     *display,
+				      GLXDrawable drawable,
+				      int	  x,
+				      int	  y,
+				      int	  width,
+				      int	  height);
+
+typedef int (*GLXGetVideoSyncProc)  (unsigned int *count);
+typedef int (*GLXWaitVideoSyncProc) (int	  divisor,
+				     int	  remainder,
+				     unsigned int *count);
+typedef int (*GLXSwapIntervalProc) (int interval);
 
     #ifndef GLX_VERSION_1_3
     typedef struct __GLXFBConfigRec *GLXFBConfig;
@@ -413,102 +415,102 @@
     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;
 
     #ifndef USE_GLES
-    extern GLCreateShaderObjectARBProc createShaderObjectARB;
+    extern GLCreateShaderObjectARBProc  createShaderObjectARB;
     extern GLCreateProgramObjectARBProc createProgramObjectARB;
-    extern GLShaderSourceARBProc shaderSourceARB;
-    extern GLCompileShaderARBProc compileShaderARB;
-    extern GLValidateProgramARBProc validateProgramARB;
-    extern GLDeleteObjectARBProc deleteObjectARB;
-    extern GLAttachObjectARBProc attachObjectARB;
-    extern GLLinkProgramARBProc linkProgramARB;
-    extern GLUseProgramObjectARBProc useProgramObjectARB;
-    extern GLGetUniformLocationARBProc getUniformLocationARB;
-    extern GLGetAttribLocationARBProc getAttribLocationARB;
+    extern GLShaderSourceARBProc        shaderSourceARB;
+    extern GLCompileShaderARBProc       compileShaderARB;
+    extern GLValidateProgramARBProc     validateProgramARB;
+    extern GLDeleteObjectARBProc        deleteObjectARB;
+    extern GLAttachObjectARBProc        attachObjectARB;
+    extern GLLinkProgramARBProc         linkProgramARB;
+    extern GLUseProgramObjectARBProc    useProgramObjectARB;
+    extern GLGetUniformLocationARBProc  getUniformLocationARB;
+    extern GLGetAttribLocationARBProc   getAttribLocationARB;
 
     extern GLGetObjectParameterivProc   getObjectParameteriv;
-    extern GLGetInfoLogProc	    getInfoLog;
+    extern GLGetInfoLogProc             getInfoLog;
     #endif
 
 #ifdef USE_GLES
 
     static const GLenum 		    FRAMEBUFFER_BINDING = GL_FRAMEBUFFER_BINDING;
-    static const GLenum 		    FRAMEBUFFER = GL_FRAMEBUFFER;
-    static const GLenum			    RENDERBUFFER = GL_RENDERBUFFER;
-    static const GLenum 		    COLOR_ATTACHMENT0 = GL_COLOR_ATTACHMENT0;
-    static const GLenum 		    DEPTH_ATTACHMENT = GL_DEPTH_ATTACHMENT;
-    static const GLenum			    STENCIL_ATTACHMENT = GL_STENCIL_ATTACHMENT;
-    static const GLenum			    DEPTH24_STENCIL8 = GL_DEPTH24_STENCIL8_OES;
+    static const GLenum 		    FRAMEBUFFER         = GL_FRAMEBUFFER;
+    static const GLenum			    RENDERBUFFER        = GL_RENDERBUFFER;
+    static const GLenum 		    COLOR_ATTACHMENT0   = GL_COLOR_ATTACHMENT0;
+    static const GLenum 		    DEPTH_ATTACHMENT    = GL_DEPTH_ATTACHMENT;
+    static const GLenum			    STENCIL_ATTACHMENT  = GL_STENCIL_ATTACHMENT;
+    static const GLenum			    DEPTH24_STENCIL8    = GL_DEPTH24_STENCIL8_OES;
 
     /* OpenGL|ES does not support different draw/read framebuffers */
-    static const GLenum 		    DRAW_FRAMEBUFFER = GL_FRAMEBUFFER;
-    static const GLenum 		    READ_FRAMEBUFFER = GL_FRAMEBUFFER;
-    static const GLenum	                    DRAW_FRAMEBUFFER_BINDING = FRAMEBUFFER_BINDING;
-    static const GLenum	                    READ_FRAMEBUFFER_BINDING = FRAMEBUFFER_BINDING;
+    static const GLenum 		    DRAW_FRAMEBUFFER         = GL_FRAMEBUFFER;
+    static const GLenum 		    READ_FRAMEBUFFER         = GL_FRAMEBUFFER;
+    static const GLenum 		    DRAW_FRAMEBUFFER_BINDING = FRAMEBUFFER_BINDING;
+    static const GLenum 		    READ_FRAMEBUFFER_BINDING = FRAMEBUFFER_BINDING;
 
-    static const GLenum 		    FRAMEBUFFER_COMPLETE = GL_FRAMEBUFFER_COMPLETE;
-    static const GLenum 		    FRAMEBUFFER_UNDEFINED = 0;
-    static const GLenum 		    FRAMEBUFFER_INCOMPLETE_ATTACHMENT = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
+    static const GLenum 		    FRAMEBUFFER_COMPLETE                      = GL_FRAMEBUFFER_COMPLETE;
+    static const GLenum 		    FRAMEBUFFER_UNDEFINED                     = 0;
+    static const GLenum 		    FRAMEBUFFER_INCOMPLETE_ATTACHMENT         = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
     static const GLenum 		    FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT;
-    static const GLenum 		    FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER = 0;
-    static const GLenum 		    FRAMEBUFFER_INCOMPLETE_READ_BUFFER = 0;
-    static const GLenum 		    FRAMEBUFFER_UNSUPPORTED = GL_FRAMEBUFFER_UNSUPPORTED;
-    static const GLenum 		    FRAMEBUFFER_INCOMPLETE_MULTISAMPLE = 0;
-    static const GLenum 		    FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS = 0;
-    static const GLenum 		    FRAMEBUFFER_INCOMPLETE_DIMENSIONS = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS;
+    static const GLenum 		    FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER        = 0;
+    static const GLenum 		    FRAMEBUFFER_INCOMPLETE_READ_BUFFER        = 0;
+    static const GLenum 		    FRAMEBUFFER_UNSUPPORTED                   = GL_FRAMEBUFFER_UNSUPPORTED;
+    static const GLenum 		    FRAMEBUFFER_INCOMPLETE_MULTISAMPLE        = 0;
+    static const GLenum 		    FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS      = 0;
+    static const GLenum 		    FRAMEBUFFER_INCOMPLETE_DIMENSIONS         = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS;
 
     static const GLenum 		    ARRAY_BUFFER = GL_ARRAY_BUFFER;
-    static const GLenum 		    STATIC_DRAW = GL_STATIC_DRAW;
-    static const GLenum 		    STREAM_DRAW = GL_STREAM_DRAW;
+    static const GLenum 		    STATIC_DRAW  = GL_STATIC_DRAW;
+    static const GLenum 		    STREAM_DRAW  = GL_STREAM_DRAW;
     static const GLenum 		    DYNAMIC_DRAW = GL_DYNAMIC_DRAW;
 
     static const GLenum 		    INFO_LOG_LENGTH = GL_INFO_LOG_LENGTH;
-    static const GLenum 		    COMPILE_STATUS = GL_COMPILE_STATUS;
-    static const GLenum 		    LINK_STATUS = GL_LINK_STATUS;
+    static const GLenum 		    COMPILE_STATUS  = GL_COMPILE_STATUS;
+    static const GLenum 		    LINK_STATUS     = GL_LINK_STATUS;
     static const GLenum 		    FRAGMENT_SHADER = GL_FRAGMENT_SHADER;
-    static const GLenum 		    VERTEX_SHADER = GL_VERTEX_SHADER;
+    static const GLenum 		    VERTEX_SHADER   = GL_VERTEX_SHADER;
 
 #else
 
     static const GLenum 		  FRAMEBUFFER_BINDING = GL_FRAMEBUFFER_BINDING_EXT;
-    static const GLenum 		  FRAMEBUFFER = GL_FRAMEBUFFER_EXT;
-    static const GLenum			  RENDERBUFFER = GL_RENDERBUFFER;
-    static const GLenum 		  COLOR_ATTACHMENT0 = GL_COLOR_ATTACHMENT0_EXT;
-    static const GLenum 		  DEPTH_ATTACHMENT = GL_DEPTH_ATTACHMENT_EXT;
-    static const GLenum			  STENCIL_ATTACHMENT = GL_STENCIL_ATTACHMENT_EXT;
-    static const GLenum			  DEPTH24_STENCIL8 = GL_DEPTH24_STENCIL8_EXT;
+    static const GLenum 		  FRAMEBUFFER         = GL_FRAMEBUFFER_EXT;
+    static const GLenum			  RENDERBUFFER        = GL_RENDERBUFFER;
+    static const GLenum 		  COLOR_ATTACHMENT0   = GL_COLOR_ATTACHMENT0_EXT;
+    static const GLenum 		  DEPTH_ATTACHMENT    = GL_DEPTH_ATTACHMENT_EXT;
+    static const GLenum			  STENCIL_ATTACHMENT  = GL_STENCIL_ATTACHMENT_EXT;
+    static const GLenum			  DEPTH24_STENCIL8    = GL_DEPTH24_STENCIL8_EXT;
 
-    static const GLenum 		  DRAW_FRAMEBUFFER = GL_DRAW_FRAMEBUFFER_EXT;
-    static const GLenum 		  READ_FRAMEBUFFER = GL_READ_FRAMEBUFFER_EXT;
-    static const GLenum	                  DRAW_FRAMEBUFFER_BINDING = GL_DRAW_FRAMEBUFFER_BINDING_EXT;
-    static const GLenum	                  READ_FRAMEBUFFER_BINDING = GL_READ_FRAMEBUFFER_BINDING_EXT;
-    static const GLenum 		  FRAMEBUFFER_COMPLETE = GL_FRAMEBUFFER_COMPLETE_EXT;
-    static const GLenum 		  FRAMEBUFFER_UNDEFINED = GL_FRAMEBUFFER_UNDEFINED;
-    static const GLenum 		  FRAMEBUFFER_INCOMPLETE_ATTACHMENT = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT;
+    static const GLenum 		  DRAW_FRAMEBUFFER                          = GL_DRAW_FRAMEBUFFER_EXT;
+    static const GLenum 		  READ_FRAMEBUFFER                          = GL_READ_FRAMEBUFFER_EXT;
+    static const GLenum			  DRAW_FRAMEBUFFER_BINDING                  = GL_DRAW_FRAMEBUFFER_BINDING_EXT;
+    static const GLenum			  READ_FRAMEBUFFER_BINDING                  = GL_READ_FRAMEBUFFER_BINDING_EXT;
+    static const GLenum 		  FRAMEBUFFER_COMPLETE                      = GL_FRAMEBUFFER_COMPLETE_EXT;
+    static const GLenum 		  FRAMEBUFFER_UNDEFINED                     = GL_FRAMEBUFFER_UNDEFINED;
+    static const GLenum 		  FRAMEBUFFER_INCOMPLETE_ATTACHMENT         = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT;
     static const GLenum 		  FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT;
-    static const GLenum 		  FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER = GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT;
-    static const GLenum 		  FRAMEBUFFER_INCOMPLETE_READ_BUFFER = GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT;
-    static const GLenum 		  FRAMEBUFFER_UNSUPPORTED = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
-    static const GLenum 		  FRAMEBUFFER_INCOMPLETE_MULTISAMPLE = GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT;
-    static const GLenum 		  FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS = GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT;
-    static const GLenum 		  FRAMEBUFFER_INCOMPLETE_DIMENSIONS = 0;
+    static const GLenum 		  FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER        = GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT;
+    static const GLenum 		  FRAMEBUFFER_INCOMPLETE_READ_BUFFER        = GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT;
+    static const GLenum 		  FRAMEBUFFER_UNSUPPORTED                   = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
+    static const GLenum 		  FRAMEBUFFER_INCOMPLETE_MULTISAMPLE        = GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT;
+    static const GLenum 		  FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS      = GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT;
+    static const GLenum 		  FRAMEBUFFER_INCOMPLETE_DIMENSIONS         = 0;
 
     static const GLenum 		  ARRAY_BUFFER = GL_ARRAY_BUFFER_ARB;
-    static const GLenum 		  STATIC_DRAW = GL_STATIC_DRAW_ARB;
-    static const GLenum 		  STREAM_DRAW = GL_STREAM_DRAW_ARB;
+    static const GLenum 		  STATIC_DRAW  = GL_STATIC_DRAW_ARB;
+    static const GLenum 		  STREAM_DRAW  = GL_STREAM_DRAW_ARB;
     static const GLenum 		  DYNAMIC_DRAW = GL_DYNAMIC_DRAW_ARB;
 
     static const GLenum 		  INFO_LOG_LENGTH = GL_OBJECT_INFO_LOG_LENGTH_ARB;
-    static const GLenum 		  COMPILE_STATUS = GL_OBJECT_COMPILE_STATUS_ARB;
-    static const GLenum 		  LINK_STATUS = GL_OBJECT_LINK_STATUS_ARB;
+    static const GLenum 		  COMPILE_STATUS  = GL_OBJECT_COMPILE_STATUS_ARB;
+    static const GLenum 		  LINK_STATUS     = GL_OBJECT_LINK_STATUS_ARB;
     static const GLenum 		  FRAGMENT_SHADER = GL_FRAGMENT_SHADER_ARB;
-    static const GLenum 		  VERTEX_SHADER = GL_VERTEX_SHADER_ARB;
+    static const GLenum 		  VERTEX_SHADER   = GL_VERTEX_SHADER_ARB;
 
 #endif
 
@@ -553,7 +555,8 @@
 #endif
 };
 
-struct GLScreenPaintAttrib {
+struct GLScreenPaintAttrib
+{
     GLfloat xRotate;
     GLfloat yRotate;
     GLfloat vRotate;
@@ -566,7 +569,8 @@
 #define MAX_DEPTH 32
 
 #ifndef USE_GLES
-struct GLFBConfig {
+struct GLFBConfig
+{
     GLXFBConfig fbConfig;
     int         yInverted;
     int         mipmap;
@@ -647,9 +651,9 @@
 				       CompOutput 		 *output,
 				       GLMatrix 		 *mask);
 
-	virtual void glEnableOutputClipping (const GLMatrix &,
+	virtual void glEnableOutputClipping (const GLMatrix   &,
 					     const CompRegion &,
-					     CompOutput *);
+					     CompOutput       *);
 	virtual void glDisableOutputClipping ();
 
 	virtual GLMatrix *projectionMatrix ();
@@ -669,9 +673,9 @@
 	/**
 	 * Hookable function used by plugins to determine stenciling mask
 	 */
-	virtual void glBufferStencil (const GLMatrix       &matrix,
-				      GLVertexBuffer       &vertexBuffer,
-				      CompOutput           *output);
+	virtual void glBufferStencil (const GLMatrix &matrix,
+				      GLVertexBuffer &vertexBuffer,
+				      CompOutput     *output);
 
 };
 
@@ -925,7 +929,7 @@
 	const GLTexture::List &       textures () const;
 
 	/**
-	 * Returns the matrices for the tiled textures for this windwo
+	 * Returns the matrices for the tiled textures for this window
 	 */
 	const GLTexture::MatrixList & matrices () const;
 
@@ -971,4 +975,3 @@
 };
 
 #endif
-
 
=== modified file 'plugins/opengl/include/opengl/program.h'
--- plugins/opengl/include/opengl/program.h	2012-05-17 10:41:21 +0000
+++ plugins/opengl/include/opengl/program.h	2013-07-24 16:05:45 +0000
@@ -40,6 +40,7 @@
 class GLProgram
 {
     public:
+
 	GLProgram (CompString &vertexShader, CompString &fragmentShader);
 	~GLProgram ();
 
@@ -47,29 +48,50 @@
 	void bind ();
 	void unbind ();
 
-	bool setUniform   (const char *name, GLfloat value);
-	bool setUniform   (const char *name, GLint value);
-	bool setUniform   (const char *name, const GLMatrix &value);
-	bool setUniform2f (const char *name, GLfloat x, GLfloat y);
-	bool setUniform3f (const char *name, GLfloat x, GLfloat y, GLfloat z);
+	bool setUniform   (const char *name,
+			   GLfloat    value);
+
+	bool setUniform   (const char *name,
+			   GLint      value);
+
+	bool setUniform   (const char     *name,
+			   const GLMatrix &value);
+
+	bool setUniform2f (const char *name,
+			   GLfloat    x,
+			   GLfloat    y);
+
+	bool setUniform3f (const char *name,
+			   GLfloat    x,
+			   GLfloat    y,
+			   GLfloat    z);
+
 	bool setUniform4f (const char *name,
-	                   GLfloat x,
-	                   GLfloat y,
-	                   GLfloat z,
-                           GLfloat w);
-	bool setUniform2i (const char *name, GLint x, GLint y);
-	bool setUniform3i (const char *name, GLint x, GLint y, GLint z);
+			   GLfloat    x,
+			   GLfloat    y,
+			   GLfloat    z,
+			   GLfloat    w);
+
+	bool setUniform2i (const char *name,
+			   GLint      x,
+			   GLint      y);
+
+	bool setUniform3i (const char *name,
+			   GLint      x,
+			   GLint      y,
+			   GLint      z);
+
 	bool setUniform4i (const char *name,
-	                   GLint x,
-	                   GLint y,
-	                   GLint z,
-                           GLint w);
+			   GLint      x,
+			   GLint      y,
+			   GLint      z,
+			   GLint      w);
 
 	GLuint attributeLocation (const char *name);
 
     private:
+
 	PrivateProgram *priv;
 };
 
 #endif // _COMPIZ_GLPROGRAM_H
-
 
=== modified file 'plugins/opengl/include/opengl/programcache.h'
--- plugins/opengl/include/opengl/programcache.h	2012-05-17 10:41:21 +0000
+++ plugins/opengl/include/opengl/programcache.h	2013-07-24 16:05:45 +0000
@@ -38,9 +38,11 @@
 class GLProgramCache
 {
     private:
+
 	PrivateProgramCache *priv;
 
     public:
+
 	GLProgramCache (size_t);
 	~GLProgramCache ();
 
@@ -48,4 +50,3 @@
 };
 
 #endif // _COMPIZ_GLPROGRAMCACHE_H
-
 
=== modified file 'plugins/opengl/include/opengl/texture.h'
--- plugins/opengl/include/opengl/texture.h	2012-09-18 11:32:20 +0000
+++ plugins/opengl/include/opengl/texture.h	2013-07-24 16:05:45 +0000
@@ -73,15 +73,18 @@
 /**
  * Class which represents an openGL texture
  */
-class GLTexture : public CompRect {
+class GLTexture : public CompRect
+{
     public:
 
-	typedef enum {
+	typedef enum
+	{
 	    Fast,
 	    Good
 	} Filter;
 
-	typedef struct {
+	typedef struct
+	{
 	    float xx; float yx;
 	    float xy; float yy;
 	    float x0; float y0;
@@ -93,9 +96,10 @@
 	 * Class which represents a list of openGL textures,
 	 * usually used for texture tiling
 	 */
-	class List : public std::vector <GLTexture *> {
-
+	class List : public std::vector <GLTexture *>
+	{
 	    public:
+
 		List ();
 		List (unsigned int);
 		List (const List &);
@@ -224,12 +228,14 @@
 	friend class PrivateTexture;
 
     protected:
+
 	GLTexture ();
 	virtual ~GLTexture ();
 
 	void setData (GLenum target, Matrix &m, bool mipmap);
 
     private:
+
 	PrivateTexture *priv;
 };
 
 
=== modified file 'plugins/opengl/include/opengl/vector.h'
--- plugins/opengl/include/opengl/vector.h	2012-05-17 10:41:21 +0000
+++ plugins/opengl/include/opengl/vector.h	2013-07-24 16:05:45 +0000
@@ -30,9 +30,12 @@
  * Class which describes a point or vector
  * in 3D space
  */
-class GLVector {
+class GLVector
+{
     public:
-	typedef enum {
+
+	typedef enum
+	{
 	    x,
 	    y,
 	    z,
@@ -105,6 +108,7 @@
 	GLVector& homogenize ();
 
     private:
+
 	friend GLVector operator+ (const GLVector& lhs,
 				   const GLVector& rhs);
 	friend GLVector operator- (const GLVector& lhs,
 
=== modified file 'plugins/opengl/src/blacklist/blacklist.cpp'
--- plugins/opengl/src/blacklist/blacklist.cpp	2012-12-12 07:24:34 +0000
+++ plugins/opengl/src/blacklist/blacklist.cpp	2013-07-24 16:05:45 +0000
@@ -30,8 +30,10 @@
 namespace compiz {
 namespace opengl {
 
-bool blacklisted (const char *blacklistRegex, const char *glVendor,
-                  const char *glRenderer, const char *glVersion)
+bool blacklisted (const char *blacklistRegex,
+		  const char *glVendor,
+		  const char *glRenderer,
+		  const char *glVersion)
 {
     bool matches = false;
 
@@ -42,16 +44,16 @@
 	// Ensure the regex contains something other than spaces, or ignore.
 	const char *p = blacklistRegex;
 	while (*p == ' ')
-	    p++;
+	    ++p;
 
 	if (*p && !regcomp (&re, blacklistRegex, REG_EXTENDED))
 	{
 	    char driver[1024];
 
 	    snprintf (driver, sizeof driver, "%s\n%s\n%s",
-	              glVendor ?   glVendor   : "",
-	              glRenderer ? glRenderer : "",
-	              glVersion ?  glVersion  : "");
+		      glVendor ?   glVendor   : "",
+		      glRenderer ? glRenderer : "",
+		      glVersion ?  glVersion  : "");
 
 	    if (!regexec (&re, driver, 0, NULL, 0))
 		matches = true;
 
=== modified file 'plugins/opengl/src/blacklist/blacklist.h'
--- plugins/opengl/src/blacklist/blacklist.h	2012-12-12 07:24:34 +0000
+++ plugins/opengl/src/blacklist/blacklist.h	2013-07-24 16:05:45 +0000
@@ -29,8 +29,10 @@
 namespace compiz {
 namespace opengl {
 
-bool blacklisted (const char *blacklistRegex, const char *glVendor,
-                  const char *glRenderer, const char *glVersion);
+bool blacklisted (const char *blacklistRegex,
+		  const char *glVendor,
+		  const char *glRenderer,
+		  const char *glVersion);
 
 } // namespace opengl
 } // namespace compiz
 
=== modified file 'plugins/opengl/src/doublebuffer/src/double-buffer.cpp'
--- plugins/opengl/src/doublebuffer/src/double-buffer.cpp	2012-11-09 06:13:00 +0000
+++ plugins/opengl/src/doublebuffer/src/double-buffer.cpp	2013-07-24 16:05:45 +0000
@@ -66,7 +66,7 @@
 
 void
 DoubleBuffer::render (const CompRegion &region,
-                      bool fullscreen)
+		      bool             fullscreen)
 {
     if (fullscreen)
     {
@@ -77,9 +77,7 @@
 
 	if (setting[NEED_PERSISTENT_BACK_BUFFER] &&
 	    !setting[HAVE_PERSISTENT_BACK_BUFFER])
-	{
 	    copyFrontToBack ();
-	}
     }
     else
     {
@@ -124,7 +122,7 @@
 
 	/* Accumulate throttle */
 	if (throttleState == ExternalFrameThrottlingRequired)
-	    blockingVSyncUnthrottledFrames++;
+	    ++blockingVSyncUnthrottledFrames;
 	else
 	    blockingVSyncUnthrottledFrames = 0;
 
 
=== modified file 'plugins/opengl/src/framebufferobject.cpp'
--- plugins/opengl/src/framebufferobject.cpp	2012-08-06 09:44:49 +0000
+++ plugins/opengl/src/framebufferobject.cpp	2013-07-24 16:05:45 +0000
@@ -32,6 +32,7 @@
     PrivateGLFramebufferObject () :
 	fboId (0),
 	pushedId (0),
+	rbStencilId (0),
 	glTex (NULL),
 	status (-1)
     {
@@ -40,14 +41,14 @@
     void pushFBO ();
     void popFBO ();
 
-    GLuint fboId;
-    GLuint pushedId;
-    GLuint rbStencilId;
-    GLTexture *glTex;
-
-    GLint status;
-
-    static GLuint boundId;
+    GLuint                                         fboId;
+    GLuint                                         pushedId;
+    GLuint                                         rbStencilId;
+    GLTexture                                      *glTex;
+
+    GLint                                          status;
+
+    static GLuint                                  boundId;
     static std::map<GLuint, GLFramebufferObject *> idMap;
 };
 
@@ -58,6 +59,7 @@
 PrivateGLFramebufferObject::pushFBO ()
 {
     pushedId = boundId;
+
     if (boundId != fboId)
     {
 	(*GL::bindFramebuffer) (GL::FRAMEBUFFER, fboId);
@@ -94,22 +96,24 @@
     (*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)
+GLFramebufferObject::allocate (const CompSize &size,
+			       const char     *image,
+			       GLenum         format,
+			       GLenum         type)
 {
     priv->status = -1;
 
-    if (!priv->glTex ||
-        size.width () != priv->glTex->width () ||
-        size.height () != priv->glTex->height ())
+    if (!priv->glTex				||
+	size.width () != priv->glTex->width ()	||
+	size.height () != priv->glTex->height ())
     {
 	if (priv->glTex)
 	    GLTexture::decRef (priv->glTex);
+
 	priv->glTex = NULL;
 
 	GLTexture::List list = GLTexture::imageDataToTexture (image, size,
@@ -130,12 +134,12 @@
     priv->pushFBO ();
 
     (*GL::framebufferTexture2D) (GL::FRAMEBUFFER, GL::COLOR_ATTACHMENT0,
-                                 priv->glTex->target (),
-                                 priv->glTex->name (), 0);
+				 priv->glTex->target (),
+				 priv->glTex->name (), 0);
 
     priv->status = (*GL::checkFramebufferStatus) (GL::DRAW_FRAMEBUFFER);
+    priv->popFBO ();
 
-    priv->popFBO ();
     return true;
 }
 
@@ -146,8 +150,8 @@
 
     if (priv->boundId != 0)
     {
-	std::map<GLuint, GLFramebufferObject *>::iterator it;
-	it = PrivateGLFramebufferObject::idMap.find (priv->boundId);
+	std::map<GLuint, GLFramebufferObject *>::iterator it =
+	    PrivateGLFramebufferObject::idMap.find (priv->boundId);
 
 	if (it != PrivateGLFramebufferObject::idMap.end ())
 	    old = it->second;
@@ -209,8 +213,9 @@
 	return true;
 
     compLogMessage ("opengl", CompLogLevelError,
-                    "FBO is incomplete: %s (0x%04x)",
-                    getFboErrorString (priv->status), priv->status);
+		    "FBO is incomplete: %s (0x%04x)",
+		    getFboErrorString (priv->status), priv->status);
+
     return false;
 }
 
 
=== modified file 'plugins/opengl/src/fsregion/fsregion.cpp'
--- plugins/opengl/src/fsregion/fsregion.cpp	2013-05-08 15:04:46 +0000
+++ plugins/opengl/src/fsregion/fsregion.cpp	2013-07-24 16:05:45 +0000
@@ -29,16 +29,16 @@
 namespace opengl {
 
 FullscreenRegion::FullscreenRegion (const CompRect &output) :
-    untouched (output),
-    orig (output),
+    untouched  (output),
+    orig       (output),
     allOutputs (output)
 {
 }
 
-FullscreenRegion::FullscreenRegion (const CompRect &output,
-                                    const CompRegion &all) :
-    untouched (output),
-    orig (output),
+FullscreenRegion::FullscreenRegion (const CompRect   &output,
+				    const CompRegion &all) :
+    untouched  (output),
+    orig       (output),
     allOutputs (all)
 {
 }
@@ -48,12 +48,10 @@
 {
     bool fullscreen = false;
 
-    if (!(flags & (Desktop | Alpha | NoOcclusionDetection)) &&
-        region == untouched &&
-        region == orig)
-    {
+    if (!(flags & (Desktop | Alpha | NoOcclusionDetection))	&&
+	region == untouched					&&
+	region == orig)
 	fullscreen = true;
-    }
 
     untouched -= region;
 
 
=== modified file 'plugins/opengl/src/fsregion/fsregion.h'
--- plugins/opengl/src/fsregion/fsregion.h	2013-05-08 15:04:46 +0000
+++ plugins/opengl/src/fsregion/fsregion.h	2013-07-24 16:05:45 +0000
@@ -34,23 +34,29 @@
 class FullscreenRegion
 {
 public:
+
     typedef enum
     {
-	Desktop = 1,
-	Alpha = 2,
+	Desktop              = 1,
+	Alpha                = 2,
 	NoOcclusionDetection = 3
     } WinFlag;
 
     typedef unsigned int WinFlags;
 
     FullscreenRegion (const CompRect &output);
-    FullscreenRegion (const CompRect &output, const CompRegion &all);
+
+    FullscreenRegion (const CompRect   &output,
+		      const CompRegion &all);
 
     // isCoveredBy is called for windows from TOP to BOTTOM
-    bool isCoveredBy (const CompRegion &region, WinFlags flags = 0);
+    bool isCoveredBy (const CompRegion &region,
+		      WinFlags         flags = 0);
+
     bool allowRedirection (const CompRegion &region);
 
 private:
+
     CompRegion untouched;
     CompRegion orig;
     CompRegion allOutputs;
 
=== modified file 'plugins/opengl/src/matrix.cpp'
--- plugins/opengl/src/matrix.cpp	2012-12-04 15:28:56 +0000
+++ plugins/opengl/src/matrix.cpp	2013-07-24 16:05:45 +0000
@@ -59,7 +59,8 @@
 /**
  * Identity matrix.
  */
-static const float identity[16] = {
+static const float identity[16] =
+{
     1.0, 0.0, 0.0, 0.0,
     0.0, 1.0, 0.0, 0.0,
     0.0, 0.0, 1.0, 0.0,
@@ -88,7 +89,7 @@
 	 const float *a,
 	 const float *b)
 {
-    for (int i = 0; i < 4; i++)
+    for (int i = 0; i < 4; ++i)
     {
 	const float ai0 = A(i,0), ai1 = A(i,1), ai2 = A(i,2), ai3 = A(i,3);
 
@@ -144,10 +145,10 @@
 operator* (const GLMatrix& lhs,
 	   const GLVector& rhs)
 {
-    GLVector  result;
+    GLVector    result;
     const float *a = lhs.m;
 
-    for (int i = 0; i < 4; i++)
+    for (int i = 0; i < 4; ++i)
     {
 	result[i] = A(i,0) * rhs[0] + A(i,1) * rhs[1] +
 	            A(i,2) * rhs[2] + A(i,3) * rhs[3];
@@ -202,13 +203,14 @@
              + m[4]*m[2]*m[9] + m[8]*m[1]*m[6] - m[8]*m[2]*m[5];
 
     det = m[0]*inv[0] + m[1]*inv[4] + m[2]*inv[8] + m[3]*inv[12];
+
     if (det == 0)
-        return false;
+	return false;
 
     det = 1.0f / det;
 
-    for (int i = 0; i < 16; i++)
-        m[i] = inv[i] * det;
+    for (int i = 0; i < 16; ++i)
+	m[i] = inv[i] * det;
 
     return true;
 }
@@ -223,20 +225,18 @@
  */
 void
 GLMatrix::rotate (const float angle,
-		    const float xRot,
-		    const float yRot,
-		    const float zRot)
+		  const float xRot,
+		  const float yRot,
+		  const float zRot)
 {
     float x = xRot, y = yRot, z = zRot;
-    float s, c;
     float matrix[16];
-    bool  optimized;
 
-    s = (float) sin (angle * DEG2RAD);
-    c = (float) cos (angle * DEG2RAD);
+    float s = (float) sin (angle * DEG2RAD);
+    float c = (float) cos (angle * DEG2RAD);
 
     memcpy (matrix, identity, sizeof (matrix));
-    optimized = false;
+    bool optimized = false;
 
 #define M(row, col)  matrix[col * 4 + row]
 
@@ -250,6 +250,7 @@
 		/* rotate only around z-axis */
 		M(0,0) = c;
 		M(1,1) = c;
+
 		if (z < 0.0f)
 		{
 		    M(0,1) = s;
@@ -268,6 +269,7 @@
 	    /* rotate only around y-axis */
 	    M(0,0) = c;
 	    M(2,2) = c;
+
 	    if (y < 0.0f)
 	    {
 		M(0,2) = -s;
@@ -288,6 +290,7 @@
 	    /* rotate only around x-axis */
 	    M(1,1) = c;
 	    M(2,2) = c;
+
 	    if (x < 0.0f)
 	    {
 		M(1,2) = s;
@@ -316,7 +319,6 @@
 	y /= mag;
 	z /= mag;
 
-
 	/*
 	 *     Arbitrary axis rotation matrix.
 	 *
@@ -410,8 +412,8 @@
 }
 
 void
-GLMatrix::rotate (const float       angle,
-		    const GLVector& vector)
+GLMatrix::rotate (const float     angle,
+		  const GLVector& vector)
 {
     rotate (angle,
 	    vector[GLVector::x],
@@ -431,8 +433,8 @@
  */
 void
 GLMatrix::scale (const float x,
-		   const float y,
-		   const float z)
+		 const float y,
+		 const float z)
 {
     m[0] *= x; m[4] *= y; m[8]  *= z;
     m[1] *= x; m[5] *= y; m[9]  *= z;
@@ -460,8 +462,8 @@
  */
 void
 GLMatrix::translate (const float x,
-		       const float y,
-		       const float z)
+		     const float y,
+		     const float z)
 {
     m[12] = m[0] * x + m[4] * y + m[8]  * z + m[12];
     m[13] = m[1] * x + m[5] * y + m[9]  * z + m[13];
 
=== modified file 'plugins/opengl/src/opengl.cpp'
--- plugins/opengl/src/opengl.cpp	2013-05-26 06:15:47 +0000
+++ plugins/opengl/src/opengl.cpp	2013-07-24 16:05:45 +0000
@@ -28,15 +28,15 @@
 #include <core/pluginclasshandler.h>
 #include "privates.h"
 
-const float DEFAULT_Z_CAMERA = 0.866025404f;
-
-const float RED_SATURATION_WEIGHT   = 0.30f;
-const float GREEN_SATURATION_WEIGHT = 0.59f;
-const float BLUE_SATURATION_WEIGHT  = 0.11f;
-
-const unsigned short NOTHING_TRANS_FILTER = 0;
-const unsigned short SCREEN_TRANS_FILTER  = 1;
-const unsigned short WINDOW_TRANS_FILTER  = 2;
+const float          DEFAULT_Z_CAMERA        = 0.866025404f;
+
+const float          RED_SATURATION_WEIGHT   = 0.30f;
+const float          GREEN_SATURATION_WEIGHT = 0.59f;
+const float          BLUE_SATURATION_WEIGHT  = 0.11f;
+
+const unsigned short NOTHING_TRANS_FILTER    = 0;
+const unsigned short SCREEN_TRANS_FILTER     = 1;
+const unsigned short WINDOW_TRANS_FILTER     = 2;
 
 CompOption::Vector &
 GLScreen::getOptions ()
@@ -62,7 +62,8 @@
     if (!rv || !CompOption::findOption (getOptions (), name, &index))
 	return false;
 
-    switch (index) {
+    switch (index)
+    {
 	case OpenglOptions::TextureFilter:
 	    cScreen->damageScreen ();
 
@@ -71,6 +72,7 @@
 	    else
 		textureFilter = GL_LINEAR;
 	    break;
+
 	default:
 	    break;
     }
 
=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2013-06-28 01:10:57 +0000
+++ plugins/opengl/src/paint.cpp	2013-07-24 16:05:45 +0000
@@ -45,11 +45,13 @@
 
 using namespace compiz::opengl;
 
-GLScreenPaintAttrib defaultScreenPaintAttrib = {
+GLScreenPaintAttrib defaultScreenPaintAttrib =
+{
     0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -DEFAULT_Z_CAMERA
 };
 
-GLWindowPaintAttrib GLWindow::defaultPaintAttrib = {
+GLWindowPaintAttrib GLWindow::defaultPaintAttrib =
+{
     OPAQUE, BRIGHT, COLOR, 1.0f, 1.0f, 0.0f, 0.0f
 };
 
@@ -76,12 +78,7 @@
                                   const CompRegion &region,
 				  bool             transformed)
 {
-    GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
-    GLfloat         vertexData[18];
-    GLushort        colorData[4];
-
-    BoxPtr    pBox = const_cast <Region> (region.handle ())->rects;
-    int	      n, nBox = const_cast <Region> (region.handle ())->numRects;
+    int nBox = const_cast <Region> (region.handle ())->numRects;
 
     if (!nBox)
 	return;
@@ -89,9 +86,7 @@
     if (screen->desktopWindowCount ())
     {
 	if (!backgroundTextures.empty ())
-	{
 	    backgroundTextures.clear ();
-	}
 
 	backgroundLoaded = false;
 
@@ -105,10 +100,15 @@
 	backgroundLoaded = true;
     }
 
+    GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
+    GLfloat        vertexData[18];
+    GLushort       colorData[4];
+    BoxPtr         pBox             = const_cast <Region> (region.handle ())->rects;
+    int            n                = nBox;
+
     if (backgroundTextures.empty ())
     {
 	streamingBuffer->begin (GL_TRIANGLES);
-	n = nBox;
 
 	while (n--)
 	{
@@ -134,7 +134,7 @@
 
 	    streamingBuffer->addVertices (6, vertexData);
 
-	    pBox++;
+	    ++pBox;
 	}
 
 	colorData[0] = colorData[1] = colorData[2] = 0;
@@ -146,9 +146,7 @@
     }
     else
     {
-	n = nBox;
-
-	for (unsigned int i = 0; i < backgroundTextures.size (); i++)
+	for (unsigned int i = 0; i < backgroundTextures.size (); ++i)
 	{
 	    GLfloat textureData[12];
 	    GLTexture *bg = backgroundTextures[i];
@@ -208,7 +206,7 @@
 		streamingBuffer->addVertices (6, vertexData);
 		streamingBuffer->addTexCoords (0, 6, textureData);
 
-		pBox++;
+		++pBox;
 	    }
 
 	    streamingBuffer->end ();
@@ -230,10 +228,10 @@
 
 
 /* This function currently always performs occlusion detection to
-   minimize paint regions. OpenGL precision requirements are no good
-   enough to guarantee that the results from using occlusion detection
+   minimize paint regions. OpenGL precision requirements are not good
+   enough to guarantee that the result from using occlusion detection
    is the same as without. It's likely not possible to see any
-   difference with most hardware but occlusion detection in the
+   difference with most hardware, but occlusion detection in the
    transformed screen case should be made optional for those who do
    see a difference. */
 void
@@ -242,19 +240,17 @@
 				    CompOutput       *output,
 				    unsigned int     mask)
 {
-    CompRegion    tmpRegion (region);
-    CompWindow    *w;
-    GLWindow      *gw;
-    int           windowMask, odMask;
-    bool          status, unredirectFS;
-    bool          withOffset = false;
-    GLMatrix      vTransform;
-    CompPoint     offXY;
+    CompRegion            tmpRegion (region);
+    CompWindow            *w;
+    GLWindow              *gw;
+    int                   odMask;
+    int                   windowMask = 0;
+    bool                  status, unredirectFS;
+    bool                  withOffset = false;
+    GLMatrix              vTransform;
+    CompPoint             offXY;
     std::set<CompWindow*> unredirected;
 
-    CompWindowList                   pl;
-    CompWindowList::reverse_iterator rit;
-
     unredirectFS = CompositeScreen::get (screen)->
 	getOption ("unredirect_fullscreen_windows")->value ().b ();
 
@@ -267,29 +263,24 @@
     bool blacklisted = driverIsBlacklisted (blacklist.c_str ());
 
     if (mask & PAINT_SCREEN_TRANSFORMED_MASK)
-    {
-	windowMask     = PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK;
-    }
-    else
-    {
-	windowMask     = 0;
-    }
+	windowMask = PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK;
 
     /*
      * We need to COPY the PaintList for now because there seem to be some
      * odd cases where the master list might change during the below loops.
      * (LP: #958540)
      */
-    pl = cScreen->getWindowPaintList ();
+    CompWindowList pl = cScreen->getWindowPaintList ();
 
     if (!(mask & PAINT_SCREEN_NO_OCCLUSION_DETECTION_MASK))
     {
 	FullscreenRegion fs (*output, screen->region ());
 
 	/* detect occlusions */
-	for (rit = pl.rbegin (); rit != pl.rend (); ++rit)
+	for (CompWindowList::reverse_iterator rit = pl.rbegin ();
+	     rit != pl.rend (); ++rit)
 	{
-	    w = (*rit);
+	    w  = (*rit);
 	    gw = GLWindow::get (w);
 
 	    if (w->destroyed ())
@@ -305,6 +296,7 @@
 		    gw->priv->clip = region;
 		    continue;
 		}
+
 		if (!w->isViewable ())
 		    continue;
 	    }
@@ -319,8 +311,7 @@
 		!w->onAllViewports ())
 	    {
 		withOffset = true;
-
-		offXY = w->getMovementForOffset (cScreen->windowPaintOffset ());
+		offXY      = w->getMovementForOffset (cScreen->windowPaintOffset ());
 
 		vTransform = transform;
 		vTransform.translate (offXY.x (), offXY.y (), 0);
@@ -328,32 +319,32 @@
 		gw->priv->clip.translate (-offXY.x (), -offXY. y ());
 
 		odMask |= PAINT_WINDOW_WITH_OFFSET_MASK;
-		status = gw->glPaint (gw->paintAttrib (), vTransform,
-				      tmpRegion, odMask);
+		status  = gw->glPaint (gw->paintAttrib (), vTransform,
+				       tmpRegion, odMask);
 	    }
 	    else
 	    {
 		withOffset = false;
-		status = gw->glPaint (gw->paintAttrib (), transform, tmpRegion,
-				      odMask);
+		status     = gw->glPaint (gw->paintAttrib (), transform, tmpRegion,
+					  odMask);
 	    }
 
 	    if (status)
 	    {
 		if (withOffset)
-		{
 		    tmpRegion -= w->region ().translated (offXY);
-		}
 		else
 		    tmpRegion -= w->region ();
 	    }
 
 	    FullscreenRegion::WinFlags flags = 0;
+
 	    if (w->type () & CompWindowTypeDesktopMask)
-	        flags |= FullscreenRegion::Desktop;
+		flags |= FullscreenRegion::Desktop;
+
 	    if (w->alpha ())
 		flags |= FullscreenRegion::Alpha;
-	    
+
 	    /* Anything which was not occlusion detected is not a suitable
 	     * candidate for unredirection either */
 	    if (!status)
@@ -373,37 +364,31 @@
 	     * take effect until it is un-fullscreened again. But that's better
 	     * than the high price of regex matching on every frame.
 	     */
-	    if (unredirectFS &&
-		!blacklisted &&
-		!(mask & PAINT_SCREEN_TRANSFORMED_MASK) &&
-		!(mask & PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK) &&
-		fs.isCoveredBy (w->region (), flags) &&
+	    if (unredirectFS						&&
+		!blacklisted						&&
+		!(mask & PAINT_SCREEN_TRANSFORMED_MASK)			&&
+		!(mask & PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK)	&&
+		fs.isCoveredBy (w->region (), flags)			&&
 		(!cw->redirected () || unredirectable.evaluate (w)))
-	    {
 		unredirected.insert (w);
-	    }
-	    else
+
+	    else if (!cw->redirected ())
 	    {
-		if (!cw->redirected ())
+		if (fs.allowRedirection (w->region ()))
 		{
-		    if (fs.allowRedirection (w->region ()))
-		    {
-			// 1. GLWindow::release to force gw->priv->needsRebind
-			gw->release ();
-
-			// 2. GLWindow::bind, which redirects the window,
-			//    rebinds the pixmap, and then rebinds the pixmap
-			//    to a texture.
-			gw->bind ();
-
-			// 3. Your window is now redirected again with the
-			//    latest pixmap contents.
-		    }
-		    else
-		    {
-			unredirected.insert (w);
-		    }
+		    // 1. GLWindow::release to force gw->priv->needsRebind
+		    gw->release ();
+
+		    // 2. GLWindow::bind, which redirects the window,
+		    //    rebinds the pixmap, and then rebinds the pixmap
+		    //    to a texture.
+		    gw->bind ();
+
+		    // 3. Your window is now redirected again with the
+		    //    latest pixmap contents.
 		}
+		else
+		    unredirected.insert (w);
 	    }
 	}
     }
@@ -414,8 +399,8 @@
 
     if (!(mask & PAINT_SCREEN_NO_BACKGROUND_MASK))
 	paintBackground (transform,
-	                 tmpRegion,
-	                 (mask & PAINT_SCREEN_TRANSFORMED_MASK));
+			 tmpRegion,
+			 (mask & PAINT_SCREEN_TRANSFORMED_MASK));
 
     /* paint all windows from bottom to top */
     foreach (w, pl)
@@ -423,26 +408,25 @@
 	if (w->destroyed ())
 	    continue;
 
-        gw = GLWindow::get (w);
-
-        /* Release any queued ConfigureWindow requests now */
+	gw = GLWindow::get (w);
+
+	/* Release any queued ConfigureWindow requests now */
+
 	gw->priv->configureLock->release ();
 
 	if (unredirected.find (w) != unredirected.end ())
 	    continue;
 
-	if (!w->shaded ())
-	{
-	    if (!w->isViewable ())
-		continue;
-	}
+	if (!w->shaded () &&
+	    !w->isViewable ())
+	    continue;
 
 	const CompRegion &clip =
 	    (!(mask & PAINT_SCREEN_NO_OCCLUSION_DETECTION_MASK)) ?
 	    gw->clip () : region;
 
 	if ((cScreen->windowPaintOffset ().x () != 0 ||
-	     cScreen->windowPaintOffset ().y () != 0) &&
+	     cScreen->windowPaintOffset ().y () != 0   ) &&
 	    !w->onAllViewports ())
 	{
 	    offXY = w->getMovementForOffset (cScreen->windowPaintOffset ());
@@ -450,12 +434,10 @@
 	    vTransform = transform;
 	    vTransform.translate (offXY.x (), offXY.y (), 0);
 	    gw->glPaint (gw->paintAttrib (), vTransform, clip,
-		         windowMask | PAINT_WINDOW_WITH_OFFSET_MASK);
+			 windowMask | PAINT_WINDOW_WITH_OFFSET_MASK);
 	}
 	else
-	{
 	    gw->glPaint (gw->paintAttrib (), transform, clip, windowMask);
-	}
     }
 }
 
@@ -488,20 +470,20 @@
     WRAPABLE_HND_FUNCTN (glEnableOutputClipping, transform, region, output)
 
     // Bottom-left corner of the output:
-    const GLint x = output->x1 ();
-    const GLint y = screen->height () - output->y2 ();
-    const GLsizei w = output->width ();
-    const GLsizei h = output->height ();
+    const GLint   x       = output->x1 ();
+    const GLint   y       = screen->height () - output->y2 ();
+    const GLsizei w       = output->width ();
+    const GLsizei h       = output->height ();
 
     // Transformed (only scale and translation is supported!)
-    const float *t = transform.getMatrix ();
-    const GLfloat scalex = t[0], scaley = t[5], transx = t[12], transy = t[13];
+    const float   *t      = transform.getMatrix ();
+    const GLfloat scalex  = t[0], scaley = t[5], transx = t[12], transy = t[13];
     const GLfloat centrex = x + w / 2.0f;
     const GLfloat centrey = y + h / 2.0f;
-    GLfloat scaledw = fabs (w * scalex);
-    GLfloat scaledh = fabs (h * scaley);
-    GLfloat tx = centrex - (scaledw / 2.0f) + transx * w;
-    GLfloat ty = centrey - (scaledh / 2.0f) + transy * h;
+    GLfloat       scaledw = fabs (w * scalex);
+    GLfloat       scaledh = fabs (h * scaley);
+    GLfloat       tx      = centrex - (scaledw / 2.0f) + transx * w;
+    GLfloat       ty      = centrey - (scaledh / 2.0f) + transy * h;
 
     glScissor (tx, ty, roundf (scaledw), roundf (scaledh));
     glEnable (GL_SCISSOR_TEST);
@@ -516,22 +498,22 @@
 }
 
 void
-GLScreen::glBufferStencil (const GLMatrix       &matrix,
-			   GLVertexBuffer       &vertexBuffer,
-			   CompOutput           *output)
+GLScreen::glBufferStencil (const GLMatrix &matrix,
+			   GLVertexBuffer &vertexBuffer,
+			   CompOutput     *output)
 {
     WRAPABLE_HND_FUNCTN (glBufferStencil, matrix, vertexBuffer, output);
 
-    GLfloat x = output->x ();
-    GLfloat y = screen->height () - output->y2 ();
+    GLfloat x  = output->x ();
+    GLfloat y  = screen->height () - output->y2 ();
     GLfloat x2 = output->x () + output->width ();
     GLfloat y2 = screen->height () - output->y2 () + output->height ();
 
     GLfloat vertices[] =
     {
-	x, y, 0,
-	x, y2, 0,
-	x2, y, 0,
+	x,  y,  0,
+	x,  y2, 0,
+	x2, y,  0,
 	x2, y2, 0
     };
 
@@ -576,8 +558,8 @@
 	    priv->paintOutputRegion (sTransform, region, output, mask);
 	    glDisableOutputClipping ();
 	}
-	else if ( (GL::fboEnabled && GL::fboStencilSupported) ||
-                  GL::stencilBuffer )
+	else if ((GL::fboEnabled && GL::fboStencilSupported) ||
+		 GL::stencilBuffer )
 	{
 	    sTransform.toScreenSpace (output, -sAttrib.zTranslate);
 
@@ -656,7 +638,7 @@
 	 * windows are getting transformed (and so the unredirected window
 	 * needs to be redirected again).
 	 */
-	if (!region.isEmpty () ||
+	if (!region.isEmpty ()		    ||
 	    (mask & PAINT_SCREEN_FULL_MASK) ||
 	    (mask & PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK))
 	    priv->paintOutputRegion (sTransform, region, output, mask);
@@ -671,9 +653,7 @@
 	return true;
     }
     else
-    {
 	return false;
-    }
 }
 
 void
@@ -683,9 +663,9 @@
 {
     WRAPABLE_HND_FUNCTN (glPaintCompositedOutput, region, fbo, mask)
 
-    GLMatrix sTransform;
-    const GLTexture::Matrix & texmatrix = fbo->tex ()->matrix ();
-    GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
+    GLMatrix                sTransform;
+    const GLTexture::Matrix &texmatrix       = fbo->tex ()->matrix ();
+    GLVertexBuffer          *streamingBuffer = GLVertexBuffer::streamingBuffer ();
 
     streamingBuffer->begin (GL_TRIANGLES);
 
@@ -696,7 +676,8 @@
 	GLfloat ty1 = 1.0 - COMP_TEX_COORD_Y (texmatrix, 0.0f);
 	GLfloat ty2 = 1.0 - COMP_TEX_COORD_Y (texmatrix, screen->height ());
 
-	const GLfloat vertexData[] = {
+	const GLfloat vertexData[] =
+	{
 	    0.0f,                    0.0f,                     0.0f,
 	    0.0f,                    (float)screen->height (), 0.0f,
 	    (float)screen->width (), 0.0f,                     0.0f,
@@ -706,7 +687,8 @@
 	    (float)screen->width (), 0.0f,                     0.0f,
 	};
 
-	const GLfloat textureData[] = {
+	const GLfloat textureData[] =
+	{
 	    tx1, ty1,
 	    tx1, ty2,
 	    tx2, ty1,
@@ -721,7 +703,7 @@
     else
     {
 	BoxPtr pBox = const_cast <Region> (region.handle ())->rects;
-	int nBox = const_cast <Region> (region.handle ())->numRects;
+	int    nBox = const_cast <Region> (region.handle ())->numRects;
 
 	while (nBox--)
 	{
@@ -730,7 +712,8 @@
 	    GLfloat ty1 = 1.0 - COMP_TEX_COORD_Y (texmatrix, pBox->y1);
 	    GLfloat ty2 = 1.0 - COMP_TEX_COORD_Y (texmatrix, pBox->y2);
 
-	    const GLfloat vertexData[] = {
+	    const GLfloat 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,
@@ -740,7 +723,8 @@
 		(float)pBox->x2, (float)pBox->y1, 0.0f,
 	    };
 
-	    const GLfloat textureData[] = {
+	    const GLfloat textureData[] =
+	    {
 		tx1, ty1,
 		tx1, ty2,
 		tx2, ty1,
@@ -751,7 +735,8 @@
 
 	    streamingBuffer->addVertices (6, &vertexData[0]);
 	    streamingBuffer->addTexCoords (0, 6, &textureData[0]);
-	    pBox++;
+
+	    ++pBox;
 	}
     }
 
@@ -763,16 +748,17 @@
 }
 
 static void
-addSingleQuad (GLVertexBuffer *vertexBuffer,
-	       const        GLTexture::MatrixList &matrix,
-	       unsigned int nMatrix,
-	       int          x1,
-	       int          y1,
-	       int          x2,
-	       int          y2,
-	       bool         rect)
+addSingleQuad (GLVertexBuffer              *vertexBuffer,
+	       const GLTexture::MatrixList &matrix,
+	       unsigned int                nMatrix,
+	       int                         x1,
+	       int                         y1,
+	       int                         x2,
+	       int                         y2,
+	       bool                        rect)
 {
-    GLfloat vertexData[18] = {
+    GLfloat vertexData[18] =
+    {
 	(float)x1, (float)y1, 0.0,
 	(float)x1, (float)y2, 0.0,
 	(float)x2, (float)y1, 0.0,
@@ -780,52 +766,58 @@
 	(float)x1, (float)y2, 0.0,
 	(float)x2, (float)y2, 0.0
     };
+
     vertexBuffer->addVertices (6, vertexData);
+    unsigned int it;
 
     if (rect)
     {
-	unsigned int it;
-	for (it = 0; it < nMatrix; it++)
-	{
-	    GLfloat data[2];
-	    const GLTexture::Matrix &mat = matrix[it];
-	    data[0] = COMP_TEX_COORD_X (mat, x1);
-	    data[1] = COMP_TEX_COORD_Y (mat, y1);
-	    vertexBuffer->addTexCoords (it, 1, data);
-	}
-	for (it = 0; it < nMatrix; it++)
-	{
-	    GLfloat data[2];
-	    const GLTexture::Matrix &mat = matrix[it];
-	    data[0] = COMP_TEX_COORD_X (mat, x1);
-	    data[1] = COMP_TEX_COORD_Y (mat, y2);
-	    vertexBuffer->addTexCoords (it, 1, data);
-	}
-	for (it = 0; it < nMatrix; it++)
-	{
-	    GLfloat data[2];
-	    const GLTexture::Matrix &mat = matrix[it];
-	    data[0] = COMP_TEX_COORD_X (mat, x2);
-	    data[1] = COMP_TEX_COORD_Y (mat, y1);
-	    vertexBuffer->addTexCoords (it, 1, data);
-	}
-	for (it = 0; it < nMatrix; it++)
-	{
-	    GLfloat data[2];
-	    const GLTexture::Matrix &mat = matrix[it];
-	    data[0] = COMP_TEX_COORD_X (mat, x2);
-	    data[1] = COMP_TEX_COORD_Y (mat, y1);
-	    vertexBuffer->addTexCoords (it, 1, data);
-	}
-	for (it = 0; it < nMatrix; it++)
-	{
-	    GLfloat data[2];
-	    const GLTexture::Matrix &mat = matrix[it];
-	    data[0] = COMP_TEX_COORD_X (mat, x1);
-	    data[1] = COMP_TEX_COORD_Y (mat, y2);
-	    vertexBuffer->addTexCoords (it, 1, data);
-	}
-	for (it = 0; it < nMatrix; it++)
+	for (it = 0; it < nMatrix; ++it)
+	{
+	    GLfloat data[2];
+	    const GLTexture::Matrix &mat = matrix[it];
+	    data[0] = COMP_TEX_COORD_X (mat, x1);
+	    data[1] = COMP_TEX_COORD_Y (mat, y1);
+	    vertexBuffer->addTexCoords (it, 1, data);
+	}
+
+	for (it = 0; it < nMatrix; ++it)
+	{
+	    GLfloat data[2];
+	    const GLTexture::Matrix &mat = matrix[it];
+	    data[0] = COMP_TEX_COORD_X (mat, x1);
+	    data[1] = COMP_TEX_COORD_Y (mat, y2);
+	    vertexBuffer->addTexCoords (it, 1, data);
+	}
+
+	for (it = 0; it < nMatrix; ++it)
+	{
+	    GLfloat data[2];
+	    const GLTexture::Matrix &mat = matrix[it];
+	    data[0] = COMP_TEX_COORD_X (mat, x2);
+	    data[1] = COMP_TEX_COORD_Y (mat, y1);
+	    vertexBuffer->addTexCoords (it, 1, data);
+	}
+
+	for (it = 0; it < nMatrix; ++it)
+	{
+	    GLfloat data[2];
+	    const GLTexture::Matrix &mat = matrix[it];
+	    data[0] = COMP_TEX_COORD_X (mat, x2);
+	    data[1] = COMP_TEX_COORD_Y (mat, y1);
+	    vertexBuffer->addTexCoords (it, 1, data);
+	}
+
+	for (it = 0; it < nMatrix; ++it)
+	{
+	    GLfloat data[2];
+	    const GLTexture::Matrix &mat = matrix[it];
+	    data[0] = COMP_TEX_COORD_X (mat, x1);
+	    data[1] = COMP_TEX_COORD_Y (mat, y2);
+	    vertexBuffer->addTexCoords (it, 1, data);
+	}
+
+	for (it = 0; it < nMatrix; ++it)
 	{
 	    GLfloat data[2];
 	    const GLTexture::Matrix &mat = matrix[it];
@@ -836,8 +828,7 @@
     }
     else
     {
-	unsigned int it;
-	for (it = 0; it < nMatrix; it++)
+	for (it = 0; it < nMatrix; ++it)
 	{
 	    GLfloat data[2];
 	    const GLTexture::Matrix &mat = matrix[it];
@@ -845,39 +836,44 @@
 	    data[1] = COMP_TEX_COORD_YX (mat, x1, y1);
 	    vertexBuffer->addTexCoords (it, 1, data);
 	}
-	for (it = 0; it < nMatrix; it++)
-	{
-	    GLfloat data[2];
-	    const GLTexture::Matrix &mat = matrix[it];
-	    data[0] = COMP_TEX_COORD_XY (mat, x1, y2);
-	    data[1] = COMP_TEX_COORD_YX (mat, x1, y2);
-	    vertexBuffer->addTexCoords (it, 1, data);
-	}
-	for (it = 0; it < nMatrix; it++)
-	{
-	    GLfloat data[2];
-	    const GLTexture::Matrix &mat = matrix[it];
-	    data[0] = COMP_TEX_COORD_XY (mat, x2, y1);
-	    data[1] = COMP_TEX_COORD_YX (mat, x2, y1);
-	    vertexBuffer->addTexCoords (it, 1, data);
-	}
-	for (it = 0; it < nMatrix; it++)
-	{
-	    GLfloat data[2];
-	    const GLTexture::Matrix &mat = matrix[it];
-	    data[0] = COMP_TEX_COORD_XY (mat, x2, y1);
-	    data[1] = COMP_TEX_COORD_YX (mat, x2, y1);
-	    vertexBuffer->addTexCoords (it, 1, data);
-	}
-	for (it = 0; it < nMatrix; it++)
-	{
-	    GLfloat data[2];
-	    const GLTexture::Matrix &mat = matrix[it];
-	    data[0] = COMP_TEX_COORD_XY (mat, x1, y2);
-	    data[1] = COMP_TEX_COORD_YX (mat, x1, y2);
-	    vertexBuffer->addTexCoords (it, 1, data);
-	}
-	for (it = 0; it < nMatrix; it++)
+
+	for (it = 0; it < nMatrix; ++it)
+	{
+	    GLfloat data[2];
+	    const GLTexture::Matrix &mat = matrix[it];
+	    data[0] = COMP_TEX_COORD_XY (mat, x1, y2);
+	    data[1] = COMP_TEX_COORD_YX (mat, x1, y2);
+	    vertexBuffer->addTexCoords (it, 1, data);
+	}
+
+	for (it = 0; it < nMatrix; ++it)
+	{
+	    GLfloat data[2];
+	    const GLTexture::Matrix &mat = matrix[it];
+	    data[0] = COMP_TEX_COORD_XY (mat, x2, y1);
+	    data[1] = COMP_TEX_COORD_YX (mat, x2, y1);
+	    vertexBuffer->addTexCoords (it, 1, data);
+	}
+
+	for (it = 0; it < nMatrix; ++it)
+	{
+	    GLfloat data[2];
+	    const GLTexture::Matrix &mat = matrix[it];
+	    data[0] = COMP_TEX_COORD_XY (mat, x2, y1);
+	    data[1] = COMP_TEX_COORD_YX (mat, x2, y1);
+	    vertexBuffer->addTexCoords (it, 1, data);
+	}
+
+	for (it = 0; it < nMatrix; ++it)
+	{
+	    GLfloat data[2];
+	    const GLTexture::Matrix &mat = matrix[it];
+	    data[0] = COMP_TEX_COORD_XY (mat, x1, y2);
+	    data[1] = COMP_TEX_COORD_YX (mat, x1, y2);
+	    vertexBuffer->addTexCoords (it, 1, data);
+	}
+
+	for (it = 0; it < nMatrix; ++it)
 	{
 	    GLfloat data[2];
 	    const GLTexture::Matrix &mat = matrix[it];
@@ -889,16 +885,16 @@
 }
 
 static void
-addQuads (GLVertexBuffer *vertexBuffer,
-	  const        GLTexture::MatrixList &matrix,
-	  unsigned int nMatrix,
-	  int          x1,
-	  int          y1,
-	  int          x2,
-	  int          y2,
-	  bool         rect,
-	  unsigned int maxGridWidth,
-	  unsigned int maxGridHeight)
+addQuads (GLVertexBuffer              *vertexBuffer,
+	  const GLTexture::MatrixList &matrix,
+	  unsigned int                nMatrix,
+	  int                         x1,
+	  int                         y1,
+	  int                         x2,
+	  int                         y2,
+	  bool                        rect,
+	  unsigned int                maxGridWidth,
+	  unsigned int                maxGridHeight)
 {
     if (maxGridWidth == 0 || maxGridHeight == 0)
 	return;
@@ -909,9 +905,7 @@
 	1 + (y2 - y1 - 1) / (int) maxGridHeight;
 
     if (nQuadsX == 1 && nQuadsY == 1)
-    {
 	addSingleQuad (vertexBuffer, matrix, nMatrix, x1, y1, x2, y2, rect);
-    }
     else
     {
 	int quadWidth  = 1 + (x2 - x1 - 1) / nQuadsX;  // ceil. division
@@ -942,30 +936,30 @@
 {
     WRAPABLE_HND_FUNCTN (glAddGeometry, matrix, region, clip)
 
-    BoxRec full;
     int    nMatrix = matrix.size ();
+    BoxRec full    = clip.handle ()->extents;
 
-    full = clip.handle ()->extents;
     if (region.handle ()->extents.x1 > full.x1)
 	full.x1 = region.handle ()->extents.x1;
+
     if (region.handle ()->extents.y1 > full.y1)
 	full.y1 = region.handle ()->extents.y1;
+
     if (region.handle ()->extents.x2 < full.x2)
 	full.x2 = region.handle ()->extents.x2;
+
     if (region.handle ()->extents.y2 < full.y2)
 	full.y2 = region.handle ()->extents.y2;
 
     if (full.x1 < full.x2 && full.y1 < full.y2)
     {
-	BoxPtr  pBox;
-	int     nBox;
 	BoxPtr  pClip;
 	int     nClip;
 	BoxRec  cbox;
 	int     it, x1, y1, x2, y2;
 	bool    rect = true;
 
-	for (it = 0; it < nMatrix; it++)
+	for (it = 0; it < nMatrix; ++it)
 	{
 	    if (matrix[it].xy != 0.0f || matrix[it].yx != 0.0f)
 	    {
@@ -974,8 +968,8 @@
 	    }
 	}
 
-	pBox = const_cast <Region> (region.handle ())->rects;
-	nBox = const_cast <Region> (region.handle ())->numRects;
+	BoxPtr pBox = const_cast <Region> (region.handle ())->rects;
+	int    nBox = const_cast <Region> (region.handle ())->numRects;
 
 	while (nBox--)
 	{
@@ -984,7 +978,7 @@
 	    x2 = pBox->x2;
 	    y2 = pBox->y2;
 
-	    pBox++;
+	    ++pBox;
 
 	    if (x1 < full.x1)
 		x1 = full.x1;
@@ -1014,14 +1008,17 @@
 		    {
 			cbox = *pClip;
 
-			pClip++;
+			++pClip;
 
 			if (cbox.x1 < x1)
 			    cbox.x1 = x1;
+
 			if (cbox.y1 < y1)
 			    cbox.y1 = y1;
+
 			if (cbox.x2 > x2)
 			    cbox.x2 = x2;
+
 			if (cbox.y2 > y2)
 			    cbox.y2 = y2;
 
@@ -1157,9 +1154,7 @@
 		GL::activeTexture (GL_TEXTURE2_ARB);
 	    }
 	    else
-	    {
 		w->vertexBuffer ()->render (transform, attrib);
-	    }
 
 	    texture->disable ();
 
@@ -1221,9 +1216,7 @@
 		gs->setTexEnvMode (GL_REPLACE);
 	    }
 	    else
-	    {
 		w->vertexBuffer ()->render (transform, attrib);
-	    }
 	}
 	else if (attrib.brightness != BRIGHT)
 	{
@@ -1237,9 +1230,7 @@
 	    gs->setTexEnvMode (GL_REPLACE);
 	}
 	else
-	{
 	    w->vertexBuffer ()->render (transform, attrib);
-	}
 
 	texture->disable ();
     }
@@ -1247,10 +1238,10 @@
 #endif
 
 void
-GLWindow::glDrawTexture (GLTexture          *texture,
+GLWindow::glDrawTexture (GLTexture                 *texture,
                          const GLMatrix            &transform,
 			 const GLWindowPaintAttrib &attrib,
-			 unsigned int       mask)
+			 unsigned int              mask)
 {
     WRAPABLE_HND_FUNCTN (glDrawTexture, texture, transform, attrib, mask)
 
@@ -1287,21 +1278,19 @@
 }
 
 bool
-GLWindow::glDraw (const GLMatrix     &transform,
+GLWindow::glDraw (const GLMatrix            &transform,
 		  const GLWindowPaintAttrib &attrib,
-		  const CompRegion   &region,
-		  unsigned int       mask)
+		  const CompRegion          &region,
+		  unsigned int              mask)
 {
     WRAPABLE_HND_FUNCTN_RETURN (bool, glDraw, transform,
 			      attrib, region, mask)
 
     const CompRegion &reg = (mask & PAINT_WINDOW_TRANSFORMED_MASK) ?
-                            infiniteRegion : region;
-
-    if (reg.isEmpty ())
-	return true;
-
-    if (!priv->window->isViewable () ||
+				    infiniteRegion : region;
+
+    if (reg.isEmpty ()			||
+	!priv->window->isViewable ()	||
 	!priv->cWindow->damaged ())
 	return true;
 
@@ -1327,11 +1316,12 @@
     if (priv->updateState & PrivateGLWindow::UpdateRegion)
 	priv->updateWindowRegions ();
 
-    for (unsigned int i = 0; i < priv->textures.size (); i++)
+    for (unsigned int i = 0; i < priv->textures.size (); ++i)
     {
 	ml[0] = priv->matrices[i];
 	priv->vertexBuffer->begin ();
 	glAddGeometry (ml, priv->regions[i], reg);
+
 	if (priv->vertexBuffer->end ())
 	    glDrawTexture (priv->textures[i], transform, attrib, mask);
     }
@@ -1347,8 +1337,6 @@
 {
     WRAPABLE_HND_FUNCTN_RETURN (bool, glPaint, attrib, transform, region, mask)
 
-    bool               status;
-
     priv->lastPaint = attrib;
 
     if (priv->window->alpha () || attrib.opacity != OPAQUE)
@@ -1358,16 +1346,10 @@
 
     if (mask & PAINT_WINDOW_OCCLUSION_DETECTION_MASK)
     {
-	if (mask & PAINT_WINDOW_TRANSFORMED_MASK)
-	    return false;
-
-	if (mask & PAINT_WINDOW_NO_CORE_INSTANCE_MASK)
-	    return false;
-
-	if (mask & PAINT_WINDOW_TRANSLUCENT_MASK)
-	    return false;
-
-	if (priv->window->shaded ())
+	if (mask & PAINT_WINDOW_TRANSFORMED_MASK	||
+	    mask & PAINT_WINDOW_NO_CORE_INSTANCE_MASK	||
+	    mask & PAINT_WINDOW_TRANSLUCENT_MASK	||
+	    priv->window->shaded ())
 	    return false;
 
 	return true;
@@ -1376,7 +1358,7 @@
     if (mask & PAINT_WINDOW_NO_CORE_INSTANCE_MASK)
 	return true;
 
-    status = glDraw (transform, attrib, region, mask);
+    bool status = glDraw (transform, attrib, region, mask);
 
     return status;
 }
 
=== modified file 'plugins/opengl/src/privates.h'
--- plugins/opengl/src/privates.h	2013-01-03 16:05:26 +0000
+++ plugins/opengl/src/privates.h	2013-07-24 16:05:45 +0000
@@ -59,7 +59,7 @@
 
     protected:
 
-	Display *mDpy;
+	Display        *mDpy;
 	const CompSize &mSize;
 };
 
@@ -70,9 +70,9 @@
 {
     public:
 
-	GLXDoubleBuffer (Display *,
-		       const CompSize &,
-		       Window);
+	GLXDoubleBuffer (Display        *,
+			 const CompSize &,
+			 Window           );
 
 	void swap () const;
 	bool blitAvailable () const;
@@ -93,9 +93,9 @@
 {
     public:
 
-	EGLDoubleBuffer (Display *,
-		       const CompSize &,
-		       EGLSurface const &);
+	EGLDoubleBuffer (Display          *,
+			 const CompSize   &,
+			 EGLSurface const &);
 
 	void swap () const;
 	bool blitAvailable () const;
@@ -106,7 +106,7 @@
 
     private:
 
-	EGLSurface const & mSurface;
+	EGLSurface const &mSurface;
 };
 
 #endif
@@ -114,6 +114,7 @@
 class GLIcon
 {
     public:
+
 	GLIcon () : icon (NULL) {}
 
 	CompIcon        *icon;
@@ -126,10 +127,12 @@
     public OpenglOptions
 {
     public:
+
 	PrivateGLScreen (GLScreen *gs);
 	~PrivateGLScreen ();
 
-	bool setOption (const CompString &name, CompOption::Value &value);
+	bool setOption (const CompString  &name,
+			CompOption::Value &value);
 
 	void handleEvent (XEvent *event);
 
@@ -149,7 +152,7 @@
 	bool compositingActive ();
 
 	void paintBackground (const GLMatrix   &transform,
-	                      const CompRegion &region,
+			      const CompRegion &region,
 			      bool             transformed);
 
 	void paintOutputRegion (const GLMatrix   &transform,
@@ -165,67 +168,69 @@
 
     public:
 
-	GLScreen        *gScreen;
-	CompositeScreen *cScreen;
+	GLScreen                               *gScreen;
+	CompositeScreen                        *cScreen;
 
-	GLenum textureFilter;
+	GLenum                                 textureFilter;
 
 	#ifndef USE_GLES
-	GLFBConfig      glxPixmapFBConfigs[MAX_DEPTH + 1];
+	GLFBConfig                             glxPixmapFBConfigs[MAX_DEPTH + 1];
 	#endif
 
-	GLTexture::List backgroundTextures;
-	bool            backgroundLoaded;
-
-	GLTexture::Filter filter[3];
-
-	CompPoint rasterPos;
-
-	GLMatrix *projection;
-
-	bool clearBuffers;
-	bool lighting;
+	GLTexture::List                        backgroundTextures;
+	bool                                   backgroundLoaded;
+
+	GLTexture::Filter                      filter[3];
+
+	CompPoint                              rasterPos;
+
+	GLMatrix                               *projection;
+
+	bool                                   clearBuffers;
+	bool                                   lighting;
 
 	#ifdef USE_GLES
-	EGLContext ctx;
-	EGLSurface surface;
-	EGLDoubleBuffer doubleBuffer;
+	EGLContext                             ctx;
+	EGLSurface                             surface;
+	EGLDoubleBuffer                        doubleBuffer;
 	#else
-	GLXContext ctx;
+	GLXContext                             ctx;
 
-	GL::GLXGetProcAddressProc getProcAddress;
-	GLXDoubleBuffer doubleBuffer;
+	GL::GLXGetProcAddressProc              getProcAddress;
+	GLXDoubleBuffer                        doubleBuffer;
 	#endif
 
-	GLFramebufferObject *scratchFbo;
-	CompRegion outputRegion;
+	GLFramebufferObject                    *scratchFbo;
+	CompRegion                             outputRegion;
 
-	XRectangle lastViewport;
-	bool refreshSubBuffer;
-	unsigned int lastMask;
+	XRectangle                             lastViewport;
+	bool                                   refreshSubBuffer;
+	unsigned int                           lastMask;
 
 	std::vector<GLTexture::BindPixmapProc> bindPixmap;
-	bool hasCompositing;
-	bool commonFrontbuffer;
-	bool incorrectRefreshRate; // hack for NVIDIA specifying an incorrect
-				   // refresh rate, causing us to miss vblanks
+	bool                                   hasCompositing;
+	bool                                   commonFrontbuffer;
+	bool                                   incorrectRefreshRate; // hack for NVIDIA specifying an incorrect
+								     // refresh rate, causing us to miss vblanks
 
 	GLIcon defaultIcon;
 
-	Window saveWindow; // hack for broken applications, see:
-			   // https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/807487
-
-	GLProgramCache *programCache;
-	GLShaderCache   shaderCache;
-	GLVertexBuffer::AutoProgram *autoProgram;
-
-	Pixmap rootPixmapCopy;
-	CompSize rootPixmapSize;
-
-	const char *glVendor, *glRenderer, *glVersion;
-
-	mutable CompString prevRegex;
-	mutable bool       prevBlacklisted;
+	Window                                 saveWindow; // hack for broken applications, see:
+							   // https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/807487
+
+	GLProgramCache                         *programCache;
+	GLShaderCache                          shaderCache;
+	GLVertexBuffer::AutoProgram            *autoProgram;
+
+	Pixmap                                 rootPixmapCopy;
+	CompSize                               rootPixmapSize;
+
+	const char                             *glVendor;
+	const char                             *glRenderer;
+	const char                             *glVersion;
+
+	mutable CompString                     prevRegex;
+	mutable bool                           prevBlacklisted;
 };
 
 class PrivateGLWindow :
@@ -238,55 +243,64 @@
 	static const unsigned int UpdateMatrix = 1 << 1;
 
     public:
+
 	PrivateGLWindow (CompWindow *w, GLWindow *gw);
 	~PrivateGLWindow ();
 
 	void windowNotify (CompWindowNotify n);
-	void resizeNotify (int dx, int dy, int dwidth, int dheight);
-	void moveNotify (int dx, int dy, bool now);
+
+	void resizeNotify (int dx,
+			   int dy,
+			   int dwidth,
+			   int dheight);
+
+	void moveNotify (int  dx,
+			 int  dy,
+			 bool now);
+
 	void updateFrameRegion (CompRegion &region);
 
 	void setWindowMatrix ();
+
 	void updateWindowRegions ();
 
 	void clearTextures ();
 
-	CompWindow      *window;
-	GLWindow        *gWindow;
-	CompositeWindow *cWindow;
-	GLScreen        *gScreen;
-
-	GLTexture::List       textures;
-	GLTexture::MatrixList matrices;
-	CompRegion::Vector    regions;
-	unsigned int          updateState;
-	bool		      needsRebind;
-
-	CompRegion    clip;
-
-	bool	      bindFailed;
-	bool	      overlayWindow;
-
-	GLushort opacity;
-	GLushort brightness;
-	GLushort saturation;
-
-	GLWindowPaintAttrib paint;
-	GLWindowPaintAttrib lastPaint;
-
-	unsigned int lastMask;
-
-	GLVertexBuffer *vertexBuffer;
+	CompWindow                     *window;
+	GLWindow                       *gWindow;
+	CompositeWindow                *cWindow;
+	GLScreen                       *gScreen;
+
+	GLTexture::List                textures;
+	GLTexture::MatrixList          matrices;
+	CompRegion::Vector             regions;
+	unsigned int                   updateState;
+	bool                           needsRebind;
+
+	CompRegion                     clip;
+
+	bool                           bindFailed;
+	bool                           overlayWindow;
+
+	GLushort                       opacity;
+	GLushort                       brightness;
+	GLushort                       saturation;
+
+	GLWindowPaintAttrib            paint;
+	GLWindowPaintAttrib            lastPaint;
+
+	unsigned int                   lastMask;
+
+	GLVertexBuffer                 *vertexBuffer;
 
 	// map of shaders, plugin name is key, pair of vertex and fragment
 	// shader source code is value
 	std::list<const GLShaderData*> shaders;
-	GLVertexBuffer::AutoProgram *autoProgram;
+	GLVertexBuffer::AutoProgram    *autoProgram;
 
-	std::list<GLIcon> icons;
+	std::list<GLIcon>              icons;
 
 	compiz::window::configure_buffers::Releasable::Ptr configureLock;
 };
 
 #endif
-
 
=== modified file 'plugins/opengl/src/privatetexture.h'
--- plugins/opengl/src/privatetexture.h	2012-09-18 11:32:20 +0000
+++ plugins/opengl/src/privatetexture.h	2013-07-24 16:05:45 +0000
@@ -47,8 +47,10 @@
 class GLScreen;
 class GLDisplay;
 
-class PrivateTexture {
+class PrivateTexture
+{
     public:
+
 	PrivateTexture (GLTexture *);
 	~PrivateTexture ();
 
@@ -59,6 +61,7 @@
 					      GLenum       type);
 
     public:
+
 	GLTexture         *texture;
 	GLuint            name;
 	GLenum            target;
@@ -72,8 +75,10 @@
 };
 
 #ifdef USE_GLES
-class EglTexture : public GLTexture {
+class EglTexture : public GLTexture
+{
     public:
+
 	EglTexture ();
 	~EglTexture ();
 
@@ -86,21 +91,26 @@
 					 compiz::opengl::PixmapSource source);
 
     public:
-	bool        damaged;
-	Damage      damage;
-	bool        updateMipMap;
+
+	bool   damaged;
+	Damage damage;
+	bool   updateMipMap;
 };
 
 extern std::map<Damage, EglTexture*> boundPixmapTex;
 #else
 
-class TfpTexture : public GLTexture {
+class TfpTexture : public GLTexture
+{
     public:
+
 	TfpTexture ();
 	~TfpTexture ();
 
 	void enable (Filter filter);
+
 	bool bindTexImage (const GLXPixmap &);
+
 	void releaseTexImage ();
 
 	static List bindPixmapToTexture (Pixmap                       pixmap,
@@ -110,6 +120,7 @@
 					 compiz::opengl::PixmapSource source);
 
     public:
+
 	Pixmap                       x11Pixmap;
 	GLXPixmap                    pixmap;
 	bool                         damaged;
 
=== modified file 'plugins/opengl/src/privatevertexbuffer.h'
--- plugins/opengl/src/privatevertexbuffer.h	2012-07-25 09:46:54 +0000
+++ plugins/opengl/src/privatevertexbuffer.h	2013-07-24 16:05:45 +0000
@@ -41,17 +41,20 @@
 class AbstractUniform
 {
    public:
-       void virtual set(GLProgram* program) = 0;
+
+	void virtual set (GLProgram *program) = 0;
 };
 
 template < typename T, int C >
 class Uniform: public AbstractUniform
 {
     public:
-	Uniform(const char *_name, ... );
-	void set(GLProgram* program);
+
+	Uniform (const char *_name, ... );
+	void set (GLProgram* program);
 
     public:
+
 	T a[C];
 	std::string name;
 };
@@ -60,15 +63,17 @@
 Uniform< T, C >::Uniform(const char *_name, ... )
 {
     va_list arg_list;
-    va_start( arg_list, _name );
+    va_start (arg_list, _name);
     name = _name;
-    for( int i = 0; i < C; i++ )
+
+    for (int i = 0; i < C; ++i)
 	a[i] = va_arg( arg_list, T );
+
     va_end( arg_list );
 }
 
 template < typename T, int C >
-void Uniform< T, C >::set(GLProgram* prog)
+void Uniform< T, C >::set (GLProgram *prog)
 {
     const char* n = name.c_str();
 
@@ -78,24 +83,24 @@
     {
 	switch (C)
 	{
-	    case 1: prog->setUniform   (n, (GLfloat) a[0]); break;
-	    case 2: prog->setUniform2f (n, a[0], a[1]); break;
-	    case 3: prog->setUniform3f (n, a[0], a[1], a[2]); break;
+	    case 1: prog->setUniform   (n, (GLfloat) a[0]);         break;
+	    case 2: prog->setUniform2f (n, a[0], a[1]);             break;
+	    case 3: prog->setUniform3f (n, a[0], a[1], a[2]);       break;
 	    case 4: prog->setUniform4f (n, a[0], a[1], a[2], a[3]); break;
 	}
-    } else if (typeid(a[0]) == typeid(int))
+    }
+    else if (typeid(a[0]) == typeid(int))
     {
 	switch (C)
 	{
-	    case 1: prog->setUniform   (n, (GLint) a[0]); break;
-	    case 2: prog->setUniform2i (n, a[0], a[1]); break;
-	    case 3: prog->setUniform3i (n, a[0], a[1], a[2]); break;
+	    case 1: prog->setUniform   (n, (GLint) a[0]);           break;
+	    case 2: prog->setUniform2i (n, a[0], a[1]);             break;
+	    case 3: prog->setUniform3i (n, a[0], a[1], a[2]);       break;
 	    case 4: prog->setUniform4i (n, a[0], a[1], a[2], a[3]); break;
 	}
-    } else
-    {
+    }
+    else
 	compLogMessage ("opengl", CompLogLevelError, "Unknown uniform type!");
-    }
 }
 
 class GLVertexBuffer;
@@ -103,47 +108,50 @@
 class PrivateVertexBuffer
 {
     public:
+
 	PrivateVertexBuffer ();
 	~PrivateVertexBuffer ();
 
 	int render (const GLMatrix            *projection,
 	            const GLMatrix            *modelview,
 	            const GLWindowPaintAttrib *attrib);
+
 	int legacyRender (const GLMatrix            &projection,
 	                  const GLMatrix            &modelview,
 	                  const GLWindowPaintAttrib &attrib);
 
     public:
-	static GLVertexBuffer *streamingBuffer;
-
-	std::vector<GLfloat> vertexData;
-	std::vector<GLfloat> normalData;
-	std::vector<GLfloat> colorData;
+
+	static GLVertexBuffer         *streamingBuffer;
+
+	std::vector<GLfloat>          vertexData;
+	std::vector<GLfloat>          normalData;
+	std::vector<GLfloat>          colorData;
 
 	enum
 	{
 	    MAX_TEXTURES = 4
 	};
-	std::vector<GLfloat> textureData[MAX_TEXTURES];
-	GLuint nTextures;
-
-	GLfloat color[4];
-
-	GLuint vertexOffset;
-	GLint  maxVertices;
-
-	GLProgram *program;
-	GLenum primitiveType;
-	GLenum usage;
-
-	GLuint vertexBuffer;
-	GLuint normalBuffer;
-	GLuint colorBuffer;
-	GLuint textureBuffers[4];
+
+	std::vector<GLfloat>          textureData[MAX_TEXTURES];
+	GLuint                        nTextures;
+
+	GLfloat                       color[4];
+
+	GLuint                        vertexOffset;
+	GLint                         maxVertices;
+
+	GLProgram                     *program;
+	GLenum                        primitiveType;
+	GLenum                        usage;
+
+	GLuint                        vertexBuffer;
+	GLuint                        normalBuffer;
+	GLuint                        colorBuffer;
+	GLuint                        textureBuffers[4];
 	std::vector<AbstractUniform*> uniforms;
 
-	GLVertexBuffer::AutoProgram *autoProgram;
+	GLVertexBuffer::AutoProgram   *autoProgram;
 };
 
 #endif //_VERTEXBUFFER_PRIVATE_H
-
 
=== modified file 'plugins/opengl/src/program.cpp'
--- plugins/opengl/src/program.cpp	2012-12-04 12:15:34 +0000
+++ plugins/opengl/src/program.cpp	2013-07-24 16:05:45 +0000
@@ -37,15 +37,14 @@
 
 void printShaderInfoLog (GLuint shader)
 {
-    GLint   length = 0;
-    GLint   chars  = 0;
+    GLint length = 0;
+    GLint chars  = 0;
 
     (*GL::getShaderiv) (shader, GL::INFO_LOG_LENGTH, &length);
 
     if (length > 0)
     {
-	GLchar *infoLog;
-	infoLog = new GLchar[length];
+	GLchar *infoLog = new GLchar[length];
 	(*GL::getShaderInfoLog) (shader, length, &chars, infoLog);
 	std::cout << infoLog << std::endl;
 	delete[] infoLog;
@@ -54,27 +53,26 @@
 
 void printProgramInfoLog(GLuint program)
 {
-    GLint   length = 0;
-    GLint   chars  = 0;
+    GLint length = 0;
+    GLint chars  = 0;
 
     (*GL::getProgramiv) (program, GL::INFO_LOG_LENGTH, &length);
 
     if (length > 0)
     {
-	GLchar *infoLog;
-	infoLog = new GLchar[length];
+	GLchar *infoLog = new GLchar[length];
 	(*GL::getProgramInfoLog) (program, length, &chars, infoLog);
 	std::cout << infoLog << std::endl;
 	delete[] infoLog;
     }
 }
 
-static bool compileShader (GLuint *shader, GLenum type, CompString &source)
+static bool compileShader (GLuint     *shader,
+			   GLenum     type,
+			   CompString &source)
 {
-    const GLchar *data;
     GLint         status;
-
-    data = (GLchar *)source.c_str ();
+    const GLchar *data = (GLchar *)source.c_str ();
 
     *shader = (*GL::createShader) (type);
     (*GL::shaderSource) (*shader, 1, &data, NULL);
@@ -88,9 +86,9 @@
     priv (new PrivateProgram ())
 {
     GLuint vertex, fragment;
-    GLint status;
+    GLint  status;
 
-    priv->valid = false;
+    priv->valid   = false;
     priv->program = (*GL::createProgram) ();
 
     if (!compileShader (&vertex, GL::VERTEX_SHADER, vertexShader))
@@ -114,6 +112,7 @@
     (*GL::validateProgram) (priv->program);
 
     (*GL::getProgramiv) (priv->program, GL::LINK_STATUS, &status);
+
     if (status == GL_FALSE)
     {
 	printProgramInfoLog (priv->program);
@@ -147,9 +146,11 @@
     (*GL::useProgram) (0);
 }
 
-bool GLProgram::setUniform (const char *name, GLfloat value)
+bool GLProgram::setUniform (const char *name,
+			    GLfloat    value)
 {
     GLint location = (*GL::getUniformLocation) (priv->program, name);
+
     if (location == -1)
 	return false;
 
@@ -157,9 +158,11 @@
     return true;
 }
 
-bool GLProgram::setUniform (const char *name, GLint value)
+bool GLProgram::setUniform (const char *name,
+			    GLint      value)
 {
     GLint location = (*GL::getUniformLocation) (priv->program, name);
+
     if (location == -1)
 	return false;
 
@@ -167,9 +170,11 @@
     return true;
 }
 
-bool GLProgram::setUniform (const char *name, const GLMatrix &value)
+bool GLProgram::setUniform (const char     *name,
+			    const GLMatrix &value)
 {
     GLint location = (*GL::getUniformLocation) (priv->program, name);
+
     if (location == -1)
 	return false;
 
@@ -178,10 +183,11 @@
 }
 
 bool GLProgram::setUniform2f (const char *name,
-                              GLfloat x,
-                              GLfloat y)
+			      GLfloat    x,
+			      GLfloat    y)
 {
     GLint location = (*GL::getUniformLocation) (priv->program, name);
+
     if (location == -1)
 	return false;
 
@@ -190,11 +196,12 @@
 }
 
 bool GLProgram::setUniform3f (const char *name,
-                              GLfloat x,
-                              GLfloat y,
-                              GLfloat z)
+			      GLfloat    x,
+			      GLfloat    y,
+			      GLfloat    z)
 {
     GLint location = (*GL::getUniformLocation) (priv->program, name);
+
     if (location == -1)
 	return false;
 
@@ -203,12 +210,13 @@
 }
 
 bool GLProgram::setUniform4f (const char *name,
-                              GLfloat x,
-                              GLfloat y,
-                              GLfloat z,
-                              GLfloat w)
+			      GLfloat    x,
+			      GLfloat    y,
+			      GLfloat    z,
+			      GLfloat    w)
 {
     GLint location = (*GL::getUniformLocation) (priv->program, name);
+
     if (location == -1)
 	return false;
 
@@ -217,10 +225,11 @@
 }
 
 bool GLProgram::setUniform2i (const char *name,
-                              GLint x,
-                              GLint y)
+			      GLint      x,
+			      GLint      y)
 {
     GLint location = (*GL::getUniformLocation) (priv->program, name);
+
     if (location == -1)
 	return false;
 
@@ -229,11 +238,12 @@
 }
 
 bool GLProgram::setUniform3i (const char *name,
-                              GLint x,
-                              GLint y,
-                              GLint z)
+			      GLint      x,
+			      GLint      y,
+			      GLint      z)
 {
     GLint location = (*GL::getUniformLocation) (priv->program, name);
+
     if (location == -1)
 	return false;
 
@@ -242,12 +252,13 @@
 }
 
 bool GLProgram::setUniform4i (const char *name,
-                              GLint x,
-                              GLint y,
-                              GLint z,
-                              GLint w)
+			      GLint      x,
+			      GLint      y,
+			      GLint      z,
+			      GLint      w)
 {
     GLint location = (*GL::getUniformLocation) (priv->program, name);
+
     if (location == -1)
 	return false;
 
@@ -259,4 +270,3 @@
 {
     return (*GL::getAttribLocation) (priv->program, name);
 }
-
 
=== modified file 'plugins/opengl/src/programcache.cpp'
--- plugins/opengl/src/programcache.cpp	2013-01-10 08:19:56 +0000
+++ plugins/opengl/src/programcache.cpp	2013-07-24 16:05:45 +0000
@@ -31,58 +31,50 @@
 typedef std::pair<boost::shared_ptr<GLProgram>, access_history_t::iterator> value;
 
 static GLProgram *
-compileProgram (std::string name, std::list<const GLShaderData*> shaders)
+compileProgram (std::string                    name,
+		std::list<const GLShaderData*> shaders)
 {
-    std::list<const GLShaderData*>::const_iterator it;
     std::string vertex_shader;
     std::string fragment_shader;
-    std::string vertex_functions = "";
-    std::string vertex_function_calls = "";
-    std::string fragment_functions = "";
+    std::string vertex_functions        = "";
+    std::string vertex_function_calls   = "";
+    std::string fragment_functions      = "";
     std::string fragment_function_calls = "";
-    int vpos, vcallpos, fpos, fcallpos;
 
-    for (it = shaders.begin (); it != shaders.end (); ++it)
+    for (std::list<const GLShaderData*>::const_iterator it = shaders.begin ();
+	 it != shaders.end (); ++it)
     {
 	//find the special shaders to put the rest in
 	if ((*it)->vertexShader.find ("@VERTEX_FUNCTIONS@") != std::string::npos)
-	{
 	    vertex_shader = (*it)->vertexShader;
-	}
-	else
+
+	else if ((*it)->vertexShader.length ())
 	{
-	    if ((*it)->vertexShader.length ())
-	    {
-		vertex_functions += (*it)->vertexShader;
-		vertex_function_calls += (*it)->name + "_vertex();\n";
-	    }
+	    vertex_functions      += (*it)->vertexShader;
+	    vertex_function_calls += (*it)->name + "_vertex();\n";
 	}
 
 	if ((*it)->fragmentShader.find ("@FRAGMENT_FUNCTIONS@") != std::string::npos)
-	{
 	    fragment_shader = (*it)->fragmentShader;
-	}
-	else
+
+	else if ((*it)->fragmentShader.length ())
 	{
-	    if ((*it)->fragmentShader.length ())
-	    {
-		fragment_functions += (*it)->fragmentShader;
-		fragment_function_calls += (*it)->name + "_fragment();\n";
-	    }
+	    fragment_functions      += (*it)->fragmentShader;
+	    fragment_function_calls += (*it)->name + "_fragment();\n";
 	}
     }
 
     // put shader functions and function calls into the main shader
-    vpos = vertex_shader.find ("@VERTEX_FUNCTIONS@");
+    int vpos     = vertex_shader.find ("@VERTEX_FUNCTIONS@");
     vertex_shader.replace (vpos, 18, vertex_functions);
 
-    vcallpos = vertex_shader.find ("@VERTEX_FUNCTION_CALLS@");
+    int vcallpos = vertex_shader.find ("@VERTEX_FUNCTION_CALLS@");
     vertex_shader.replace (vcallpos, 23, vertex_function_calls);
 
-    fpos = fragment_shader.find ("@FRAGMENT_FUNCTIONS@");
+    int fpos     = fragment_shader.find ("@FRAGMENT_FUNCTIONS@");
     fragment_shader.replace (fpos, 20, fragment_functions);
 
-    fcallpos = fragment_shader.find ("@FRAGMENT_FUNCTION_CALLS@");
+    int fcallpos = fragment_shader.find ("@FRAGMENT_FUNCTION_CALLS@");
     fragment_shader.replace (fcallpos, 25, fragment_function_calls);
 
     return new GLProgram (vertex_shader, fragment_shader);
@@ -91,13 +83,16 @@
 class PrivateProgramCache
 {
     public:
+
 	PrivateProgramCache (size_t);
 
 	const size_t                 capacity;
 	access_history_t             access_history;
 	std::map<std::string, value> cache;
 
-	void insert (std::string, GLProgram *);
+	void insert (std::string  ,
+		     GLProgram    *);
+
 	void evict ();
 };
 
@@ -114,10 +109,10 @@
  
 GLProgram* GLProgramCache::operator () (std::list<const GLShaderData*> shaders)
 {
-    std::list<const GLShaderData*>::const_iterator name_it;
     std::string name;
 
-    for (name_it = shaders.begin(); name_it != shaders.end(); ++name_it)
+    for (std::list<const GLShaderData*>::const_iterator name_it = shaders.begin();
+	 name_it != shaders.end(); ++name_it)
     {
 	if (name.length () == 0)
 	    name += (*name_it)->name;
@@ -136,8 +131,8 @@
     else
     {
 	priv->access_history.splice (priv->access_history.end (),
-	                             priv->access_history,
-	                             (*it).second.second);
+				     priv->access_history,
+				     (*it).second.second);
 	(*it).second.second = priv->access_history.rbegin ().base ();
 
 	return (*it).second.first.get ();
@@ -149,7 +144,8 @@
 {
 }
 
-void PrivateProgramCache::insert (std::string name, GLProgram *program)
+void PrivateProgramCache::insert (std::string name,
+				  GLProgram   *program)
 {
     assert (cache.find (name) == cache.end ());
 
@@ -173,4 +169,3 @@
     cache.erase (it);
     access_history.pop_front ();
 }
-
 
=== modified file 'plugins/opengl/src/screen.cpp'
--- plugins/opengl/src/screen.cpp	2013-05-15 10:47:42 +0000
+++ plugins/opengl/src/screen.cpp	2013-07-24 16:05:45 +0000
@@ -54,18 +54,18 @@
 class DetectionWorkaround
 {
     public:
-        DetectionWorkaround ()
-        {
-            program_invocation_short_name[0] = 'C';
-        }
-        ~DetectionWorkaround ()
-        {
-            program_invocation_short_name[0] = 'c';
-        }
+
+	DetectionWorkaround ()
+	{
+	    program_invocation_short_name[0] = 'C';
+	}
+	~DetectionWorkaround ()
+	{
+	    program_invocation_short_name[0] = 'c';
+	}
 };
 #endif
 
-
 using namespace compiz::opengl;
 
 namespace GL {
@@ -75,124 +75,124 @@
 
     GLEGLImageTargetTexture2DOESProc eglImageTargetTexture;
 
-    EGLPostSubBufferNVProc postSubBuffer = NULL;
+    EGLPostSubBufferNVProc         postSubBuffer            = NULL;
     #else
 
     typedef int (*GLXSwapIntervalProc) (int interval);
 
-    GLXBindTexImageProc      bindTexImage = NULL;
-    GLXReleaseTexImageProc   releaseTexImage = NULL;
-    GLXQueryDrawableProc     queryDrawable = NULL;
-    GLXCopySubBufferProc     copySubBuffer = NULL;
-    GLXGetVideoSyncProc      getVideoSync = NULL;
-    GLXWaitVideoSyncProc     waitVideoSync = NULL;
-    GLXSwapIntervalProc      swapInterval = NULL;
-    GLXGetFBConfigsProc      getFBConfigs = NULL;
-    GLXGetFBConfigAttribProc getFBConfigAttrib = NULL;
-    GLXCreatePixmapProc      createPixmap = NULL;
-    GLXDestroyPixmapProc     destroyPixmap = NULL;
-    GLGenProgramsProc	     genPrograms = NULL;
-    GLDeleteProgramsProc     deletePrograms = NULL;
-    GLBindProgramProc	     bindProgram = NULL;
-    GLProgramStringProc	     programString = NULL;
-    GLProgramParameter4fProc programEnvParameter4f = NULL;
-    GLProgramParameter4fProc programLocalParameter4f = NULL;
+    GLXBindTexImageProc            bindTexImage             = NULL;
+    GLXReleaseTexImageProc         releaseTexImage          = NULL;
+    GLXQueryDrawableProc           queryDrawable            = NULL;
+    GLXCopySubBufferProc           copySubBuffer            = NULL;
+    GLXGetVideoSyncProc            getVideoSync             = NULL;
+    GLXWaitVideoSyncProc           waitVideoSync            = NULL;
+    GLXSwapIntervalProc            swapInterval             = NULL;
+    GLXGetFBConfigsProc            getFBConfigs             = NULL;
+    GLXGetFBConfigAttribProc       getFBConfigAttrib        = NULL;
+    GLXCreatePixmapProc            createPixmap             = NULL;
+    GLXDestroyPixmapProc           destroyPixmap            = NULL;
+    GLGenProgramsProc              genPrograms              = NULL;
+    GLDeleteProgramsProc           deletePrograms           = NULL;
+    GLBindProgramProc              bindProgram              = NULL;
+    GLProgramStringProc            programString            = NULL;
+    GLProgramParameter4fProc       programEnvParameter4f    = NULL;
+    GLProgramParameter4fProc       programLocalParameter4f  = NULL;
     #endif
 
-    GLActiveTextureProc       activeTexture = NULL;
-    GLClientActiveTextureProc clientActiveTexture = NULL;
-    GLMultiTexCoord2fProc     multiTexCoord2f = NULL;
-
-    GLGenFramebuffersProc        genFramebuffers = NULL;
-    GLDeleteFramebuffersProc     deleteFramebuffers = NULL;
-    GLBindFramebufferProc        bindFramebuffer = NULL;
-    GLCheckFramebufferStatusProc checkFramebufferStatus = NULL;
-    GLFramebufferTexture2DProc   framebufferTexture2D = NULL;
-    GLGenerateMipmapProc         generateMipmap = NULL;
-
-    GLBindBufferProc    bindBuffer = NULL;
-    GLDeleteBuffersProc deleteBuffers = NULL;
-    GLGenBuffersProc    genBuffers = NULL;
-    GLBufferDataProc    bufferData = NULL;
-    GLBufferSubDataProc bufferSubData = NULL;
-
-    GLGetShaderivProc        getShaderiv = NULL;
-    GLGetShaderInfoLogProc   getShaderInfoLog = NULL;
-    GLGetProgramivProc       getProgramiv = NULL;
-    GLGetProgramInfoLogProc  getProgramInfoLog = NULL;
-    GLCreateShaderProc       createShader = NULL;
-    GLShaderSourceProc       shaderSource = NULL;
-    GLCompileShaderProc      compileShader = NULL;
-    GLCreateProgramProc      createProgram = NULL;
-    GLAttachShaderProc       attachShader = NULL;
-    GLLinkProgramProc        linkProgram = NULL;
-    GLValidateProgramProc    validateProgram = NULL;
-    GLDeleteShaderProc       deleteShader = NULL;
-    GLDeleteProgramProc      deleteProgram = NULL;
-    GLUseProgramProc         useProgram = NULL;
-    GLGetUniformLocationProc getUniformLocation = NULL;
-    GLUniform1fProc          uniform1f = NULL;
-    GLUniform1iProc          uniform1i = NULL;
-    GLUniform2fProc          uniform2f = NULL;
-    GLUniform2iProc          uniform2i = NULL;
-    GLUniform3fProc          uniform3f = NULL;
-    GLUniform3iProc          uniform3i = NULL;
-    GLUniform4fProc          uniform4f = NULL;
-    GLUniform4iProc          uniform4i = NULL;
-    GLUniformMatrix4fvProc   uniformMatrix4fv = NULL;
-    GLGetAttribLocationProc  getAttribLocation = NULL;
+    GLActiveTextureProc            activeTexture            = NULL;
+    GLClientActiveTextureProc      clientActiveTexture      = NULL;
+    GLMultiTexCoord2fProc          multiTexCoord2f          = NULL;
+
+    GLGenFramebuffersProc          genFramebuffers          = NULL;
+    GLDeleteFramebuffersProc       deleteFramebuffers       = NULL;
+    GLBindFramebufferProc          bindFramebuffer          = NULL;
+    GLCheckFramebufferStatusProc   checkFramebufferStatus   = NULL;
+    GLFramebufferTexture2DProc     framebufferTexture2D     = NULL;
+    GLGenerateMipmapProc           generateMipmap           = NULL;
+
+    GLBindBufferProc               bindBuffer               = NULL;
+    GLDeleteBuffersProc            deleteBuffers            = NULL;
+    GLGenBuffersProc               genBuffers               = NULL;
+    GLBufferDataProc               bufferData               = NULL;
+    GLBufferSubDataProc            bufferSubData            = NULL;
+
+    GLGetShaderivProc              getShaderiv              = NULL;
+    GLGetShaderInfoLogProc         getShaderInfoLog         = NULL;
+    GLGetProgramivProc             getProgramiv             = NULL;
+    GLGetProgramInfoLogProc        getProgramInfoLog        = NULL;
+    GLCreateShaderProc             createShader             = NULL;
+    GLShaderSourceProc             shaderSource             = NULL;
+    GLCompileShaderProc            compileShader            = NULL;
+    GLCreateProgramProc            createProgram            = NULL;
+    GLAttachShaderProc             attachShader             = NULL;
+    GLLinkProgramProc              linkProgram              = NULL;
+    GLValidateProgramProc          validateProgram          = NULL;
+    GLDeleteShaderProc             deleteShader             = NULL;
+    GLDeleteProgramProc            deleteProgram            = NULL;
+    GLUseProgramProc               useProgram               = NULL;
+    GLGetUniformLocationProc       getUniformLocation       = NULL;
+    GLUniform1fProc                uniform1f                = NULL;
+    GLUniform1iProc                uniform1i                = NULL;
+    GLUniform2fProc                uniform2f                = NULL;
+    GLUniform2iProc                uniform2i                = NULL;
+    GLUniform3fProc                uniform3f                = NULL;
+    GLUniform3iProc                uniform3i                = NULL;
+    GLUniform4fProc                uniform4f                = NULL;
+    GLUniform4iProc                uniform4i                = NULL;
+    GLUniformMatrix4fvProc         uniformMatrix4fv         = NULL;
+    GLGetAttribLocationProc        getAttribLocation        = NULL;
 
 #ifndef USE_GLES
 
-    GLCreateShaderObjectARBProc createShaderObjectARB = NULL;
-    GLCreateProgramObjectARBProc createProgramObjectARB = NULL;
-    GLCompileShaderARBProc compileShaderARB = NULL;
-    GLShaderSourceARBProc shaderSourceARB = NULL;
-    GLValidateProgramARBProc validateProgramARB = NULL;
-    GLDeleteObjectARBProc deleteObjectARB = NULL;
-    GLAttachObjectARBProc attachObjectARB = NULL;
-    GLLinkProgramARBProc linkProgramARB = NULL;
-    GLUseProgramObjectARBProc useProgramObjectARB = NULL;
-    GLGetUniformLocationARBProc getUniformLocationARB = NULL;
-    GLGetAttribLocationARBProc getAttribLocationARB = NULL;
-    GLGetObjectParameterivProc getObjectParameteriv = NULL;
-    GLGetInfoLogProc         getInfoLog = NULL;
+    GLCreateShaderObjectARBProc    createShaderObjectARB    = NULL;
+    GLCreateProgramObjectARBProc   createProgramObjectARB   = NULL;
+    GLCompileShaderARBProc         compileShaderARB         = NULL;
+    GLShaderSourceARBProc          shaderSourceARB          = NULL;
+    GLValidateProgramARBProc       validateProgramARB       = NULL;
+    GLDeleteObjectARBProc          deleteObjectARB          = NULL;
+    GLAttachObjectARBProc          attachObjectARB          = NULL;
+    GLLinkProgramARBProc           linkProgramARB           = NULL;
+    GLUseProgramObjectARBProc      useProgramObjectARB      = NULL;
+    GLGetUniformLocationARBProc    getUniformLocationARB    = NULL;
+    GLGetAttribLocationARBProc     getAttribLocationARB     = NULL;
+    GLGetObjectParameterivProc     getObjectParameteriv     = NULL;
+    GLGetInfoLogProc               getInfoLog               = NULL;
 
 #endif
 
-    GLEnableVertexAttribArrayProc  enableVertexAttribArray = NULL;
+    GLEnableVertexAttribArrayProc  enableVertexAttribArray  = NULL;
     GLDisableVertexAttribArrayProc disableVertexAttribArray = NULL;
-    GLVertexAttribPointerProc      vertexAttribPointer = NULL;
-
-    GLGenRenderbuffersProc genRenderbuffers = NULL;
-    GLDeleteRenderbuffersProc deleteRenderbuffers = NULL;
-    GLFramebufferRenderbufferProc framebufferRenderbuffer = NULL;
-    GLBindRenderbufferProc bindRenderbuffer = NULL;
-    GLRenderbufferStorageProc renderbufferStorage = NULL;
-
-    bool  textureFromPixmap = true;
-    bool  textureRectangle = false;
-    bool  textureNonPowerOfTwo = false;
-    bool  textureNonPowerOfTwoMipmap = false;
-    bool  textureEnvCombine = false;
-    bool  textureEnvCrossbar = false;
-    bool  textureBorderClamp = false;
-    bool  textureCompression = false;
-    GLint maxTextureSize = 0;
-    bool  fboSupported = false;
-    bool  fboEnabled = false;
-    bool  fboStencilSupported = false;
-    bool  vboSupported = false;
-    bool  vboEnabled = false;
-    bool  shaders = false;
-    GLint maxTextureUnits = 1;
-
-    bool canDoSaturated = false;
-    bool canDoSlightlySaturated = false;
-
-    unsigned int vsyncCount = 0;
-
-    bool stencilBuffer = false;
+    GLVertexAttribPointerProc      vertexAttribPointer      = NULL;
+
+    GLGenRenderbuffersProc         genRenderbuffers         = NULL;
+    GLDeleteRenderbuffersProc      deleteRenderbuffers      = NULL;
+    GLFramebufferRenderbufferProc  framebufferRenderbuffer  = NULL;
+    GLBindRenderbufferProc         bindRenderbuffer         = NULL;
+    GLRenderbufferStorageProc      renderbufferStorage      = NULL;
+
+    bool         textureFromPixmap          = true;
+    bool         textureRectangle           = false;
+    bool         textureNonPowerOfTwo       = false;
+    bool         textureNonPowerOfTwoMipmap = false;
+    bool         textureEnvCombine          = false;
+    bool         textureEnvCrossbar         = false;
+    bool         textureBorderClamp         = false;
+    bool         textureCompression         = false;
+    GLint        maxTextureSize             = 0;
+    bool         fboSupported               = false;
+    bool         fboEnabled                 = false;
+    bool         fboStencilSupported        = false;
+    bool         vboSupported               = false;
+    bool         vboEnabled                 = false;
+    bool         shaders                    = false;
+    GLint        maxTextureUnits            = 1;
+
+    bool         canDoSaturated             = false;
+    bool         canDoSlightlySaturated     = false;
+
+    unsigned int vsyncCount                 = 0;
+
+    bool         stencilBuffer              = false;
 #ifndef USE_GLES
 
     GLuint createShaderARBWrapper (GLenum type)
@@ -205,7 +205,10 @@
 	return static_cast <GLuint> ((GL::createProgramObjectARB) ());
     }
 
-    void shaderSourceARBWrapper (GLuint shader, GLsizei count, const GLchar **string, const GLint *length)
+    void shaderSourceARBWrapper (GLuint       shader,
+				 GLsizei      count,
+				 const GLchar **string,
+				 const GLint  *length)
     {
 	(GL::shaderSourceARB) (static_cast <GLhandleARB> (shader), count, string, length);
     }
@@ -230,7 +233,8 @@
 	(GL::deleteObjectARB) (static_cast <GLhandleARB> (program));
     }
 
-    void attachShaderARBWrapper (GLuint program, GLuint shader)
+    void attachShaderARBWrapper (GLuint program,
+				 GLuint shader)
     {
 	(GL::attachObjectARB) (static_cast <GLhandleARB> (program), static_cast <GLhandleARB> (shader));
     }
@@ -245,32 +249,44 @@
 	(GL::useProgramObjectARB) (static_cast <GLhandleARB> (program));
     }
 
-    int getUniformLocationARBWrapper (GLuint program, const GLchar *name)
+    int getUniformLocationARBWrapper (GLuint       program,
+				      const GLchar *name)
     {
 	return (GL::getUniformLocationARB) (static_cast <GLhandleARB> (program), name);
     }
 
-    int getAttribLocationARBWrapper (GLuint program, const GLchar *name)
+    int getAttribLocationARBWrapper (GLuint       program,
+				     const GLchar *name)
     {
 	return (GL::getAttribLocationARB) (static_cast <GLhandleARB> (program), name);
     }
 
-    void getProgramInfoLogARBWrapper (GLuint object, int maxLen, int *len, char *log)
-    {
-	(GL::getInfoLog) (static_cast <GLhandleARB> (object), maxLen, len, log);
-    }
-
-    void getShaderInfoLogARBWrapper (GLuint object, int maxLen, int *len, char *log)
-    {
-	(GL::getInfoLog) (static_cast <GLhandleARB> (object), maxLen, len, log);
-    }
-
-    void getShaderivARBWrapper (GLuint object, GLenum type, int *param)
+    void getProgramInfoLogARBWrapper (GLuint object,
+				      int    maxLen,
+				      int    *len,
+				      char   *log)
+    {
+	(GL::getInfoLog) (static_cast <GLhandleARB> (object), maxLen, len, log);
+    }
+
+    void getShaderInfoLogARBWrapper (GLuint object,
+				     int    maxLen,
+				     int    *len,
+				     char   *log)
+    {
+	(GL::getInfoLog) (static_cast <GLhandleARB> (object), maxLen, len, log);
+    }
+
+    void getShaderivARBWrapper (GLuint object,
+				GLenum type,
+				int    *param)
     {
 	(GL::getObjectParameteriv) (static_cast <GLhandleARB> (object), type, param);
     }
 
-    void getProgramivARBWrapper (GLuint object, GLenum type, int *param)
+    void getProgramivARBWrapper (GLuint object,
+				 GLenum type,
+				 int    *param)
     {
 	(GL::getObjectParameteriv) (static_cast <GLhandleARB> (object), type, param);
     }
@@ -286,14 +302,15 @@
 class GLScreenAutoProgram : public GLVertexBuffer::AutoProgram
 {
 public:
+
     GLScreenAutoProgram (GLScreen *gScreen) : gScreen(gScreen) {}
 
     GLProgram *getProgram (GLShaderParameters &params)
     {
-        const GLShaderData *shaderData = gScreen->getShaderData (params);
-        std::list<const GLShaderData *> tempShaders;
-        tempShaders.push_back (shaderData);
-        return gScreen->getProgram (tempShaders);
+	const GLShaderData *shaderData = gScreen->getShaderData (params);
+	std::list<const GLShaderData *> tempShaders;
+	tempShaders.push_back (shaderData);
+	return gScreen->getProgram (tempShaders);
     }
 
     GLScreen *gScreen;
@@ -341,13 +358,14 @@
 {
 namespace opengl
 {
-void swapIntervalEGL (Display *display, int interval)
+void swapIntervalEGL (Display *display,
+		      int     interval)
 {
     eglSwapInterval (eglGetDisplay (display), interval);
 }
 
-int waitVSyncEGL (int wait,
-		  int remainder,
+int waitVSyncEGL (int          wait,
+		  int          remainder,
 		  unsigned int *count)
 {
     /* not supported */
@@ -365,37 +383,37 @@
     DetectionWorkaround workaround;
 #endif
 
-    #ifdef USE_GLES
-    Display             *xdpy;
-    Window               overlay;
-    EGLDisplay           dpy;
-    EGLConfig            config;
-    EGLint               major, minor;
-    const char		*eglExtensions, *glExtensions;
-    XWindowAttributes    attr;
-    EGLint               count, visualid;
-    EGLConfig            configs[1024];
-    CompOption::Vector   o (0);
-
-    const EGLint config_attribs[] = {
-	EGL_SURFACE_TYPE,         EGL_WINDOW_BIT,
-	EGL_RED_SIZE,             1,
-	EGL_GREEN_SIZE,           1,
-	EGL_BLUE_SIZE,            1,
-	EGL_ALPHA_SIZE,           0,
-	EGL_RENDERABLE_TYPE,      EGL_OPENGL_ES2_BIT,
-	EGL_CONFIG_CAVEAT,        EGL_NONE,
-	EGL_STENCIL_SIZE,	  1,
-	EGL_NONE
-    };
-
-    const EGLint context_attribs[] = {
-        EGL_CONTEXT_CLIENT_VERSION, 2,
-        EGL_NONE
-    };
-
-    xdpy = screen->dpy ();
-    dpy = eglGetDisplay ((EGLNativeDisplayType)xdpy);
+#ifdef USE_GLES
+    Window             overlay;
+    EGLint             major, minor;
+    const char         *eglExtensions, *glExtensions;
+    XWindowAttributes  attr;
+    EGLint             count;
+    EGLConfig          configs[1024];
+    CompOption::Vector o (0);
+
+    const EGLint config_attribs[] =
+    {
+	EGL_SURFACE_TYPE,    EGL_WINDOW_BIT,
+	EGL_RED_SIZE,        1,
+	EGL_GREEN_SIZE,      1,
+	EGL_BLUE_SIZE,       1,
+	EGL_ALPHA_SIZE,      0,
+	EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+	EGL_CONFIG_CAVEAT,   EGL_NONE,
+	EGL_STENCIL_SIZE,    1,
+	EGL_NONE
+    };
+
+    const EGLint context_attribs[] =
+    {
+	EGL_CONTEXT_CLIENT_VERSION, 2,
+	EGL_NONE
+    };
+
+    Display    *xdpy = screen->dpy ();
+    EGLDisplay dpy   = eglGetDisplay ((EGLNativeDisplayType)xdpy);
+
     if (!eglInitialize (dpy, &major, &minor))
     {
 	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
@@ -416,27 +434,30 @@
 	return false;
     }
 
-    EGLint val;
-    int msaaBuffers = MAXSHORT;
-    int msaaSamples = MAXSHORT;
-    visualid = XVisualIDFromVisual (attr.visual);
-    config = configs[0];
+    EGLint    val;
+    int       msaaBuffers = MAXSHORT;
+    int       msaaSamples = MAXSHORT;
+    EGLint    visualid    = XVisualIDFromVisual (attr.visual);
+    EGLConfig config      = configs[0];
 
     for (int i = 0; i < count; ++i)
     {
 	eglGetConfigAttrib (dpy, configs[i], EGL_SAMPLE_BUFFERS, &val);
+
 	if (val > msaaBuffers)
-	   continue;
+	    continue;
 
 	msaaBuffers = val;
 
 	eglGetConfigAttrib (dpy, configs[i], EGL_SAMPLES, &val);
+
 	if (val > msaaSamples)
 	    continue;
 
 	msaaSamples = val;
 
 	eglGetConfigAttrib (dpy, configs[i], EGL_NATIVE_VISUAL_ID, &val);
+
 	if (val != visualid)
 	    continue;
 
@@ -446,10 +467,11 @@
 
     overlay = CompositeScreen::get (screen)->overlay ();
     priv->surface = eglCreateWindowSurface (dpy, config, overlay, 0);
+
     if (priv->surface == EGL_NO_SURFACE)
     {
 	compLogMessage ("opengl", CompLogLevelFatal,
-	                "eglCreateWindowSurface failed");
+			"eglCreateWindowSurface failed");
 	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
 	return false;
     }
@@ -458,6 +480,7 @@
     eglSurfaceAttrib (dpy, priv->surface, EGL_SWAP_BEHAVIOR, EGL_BUFFER_DESTROYED);
 
     priv->ctx = eglCreateContext (dpy, config, EGL_NO_CONTEXT, context_attribs);
+
     if (priv->ctx == EGL_NO_CONTEXT)
     {
 	compLogMessage ("opengl", CompLogLevelFatal, "eglCreateContext failed");
@@ -474,7 +497,7 @@
     }
 
     eglExtensions = (const char *) eglQueryString (dpy, EGL_EXTENSIONS);
-    glExtensions = (const char *) glGetString (GL_EXTENSIONS);
+    glExtensions  = (const char *) glGetString (GL_EXTENSIONS);
 
     if (!glExtensions || !eglExtensions)
     {
@@ -484,15 +507,15 @@
 	return false;
     }
 
-    GL::textureFromPixmap = true;
+    GL::textureFromPixmap    = true;
     GL::textureNonPowerOfTwo = true;
-    GL::fboSupported = true;
-    GL::fboEnabled = true;
-    GL::vboSupported = true;
-    GL::vboEnabled = true;
-    GL::shaders = true;
-    GL::stencilBuffer = true;
-    GL::maxTextureUnits = 4;
+    GL::fboSupported         = true;
+    GL::fboEnabled           = true;
+    GL::vboSupported         = true;
+    GL::vboEnabled           = true;
+    GL::shaders              = true;
+    GL::stencilBuffer        = true;
+    GL::maxTextureUnits      = 4;
     glGetIntegerv (GL_MAX_TEXTURE_SIZE, &GL::maxTextureSize);
 
     GL::createImage = (GL::EGLCreateImageKHRProc)
@@ -503,7 +526,7 @@
 	eglGetProcAddress ("glEGLImageTargetTexture2DOES");
 
     if (!strstr (eglExtensions, "EGL_KHR_image_pixmap") ||
-        !strstr (glExtensions, "GL_OES_EGL_image") ||
+	!strstr (glExtensions, "GL_OES_EGL_image")	||
 	!GL::createImage || !GL::destroyImage || !GL::eglImageTargetTexture)
     {
 	compLogMessage ("opengl", CompLogLevelFatal,
@@ -531,7 +554,7 @@
 	    eglGetProcAddress ("eglPostSubBufferNV");
 
     GL::fboStencilSupported = GL::fboSupported &&
-        strstr (glExtensions, "GL_OES_packed_depth_stencil");
+			      strstr (glExtensions, "GL_OES_packed_depth_stencil");
 
     if (!GL::fboSupported &&
 	!GL::postSubBuffer)
@@ -542,59 +565,64 @@
 	return false;
     }
 
-    GL::activeTexture = glActiveTexture;
-    GL::genFramebuffers = glGenFramebuffers;
-    GL::deleteFramebuffers = glDeleteFramebuffers;
-    GL::bindFramebuffer = glBindFramebuffer;
-    GL::checkFramebufferStatus = glCheckFramebufferStatus;
-    GL::framebufferTexture2D = glFramebufferTexture2D;
-    GL::generateMipmap = glGenerateMipmap;
-
-    GL::bindBuffer = glBindBuffer;
-    GL::deleteBuffers = glDeleteBuffers;
-    GL::genBuffers = glGenBuffers;
-    GL::bufferData = glBufferData;
-    GL::bufferSubData = glBufferSubData;
-
-    GL::getShaderiv = glGetShaderiv;
-    GL::getShaderInfoLog = glGetShaderInfoLog;
-    GL::getProgramiv = glGetProgramiv;
-    GL::getProgramInfoLog = glGetProgramInfoLog;
-    GL::createShader = glCreateShader;
-    GL::shaderSource = (GL::GLShaderSourceProc) glShaderSource;
-    GL::compileShader = glCompileShader;
-    GL::createProgram = glCreateProgram;
-    GL::attachShader = glAttachShader;
-    GL::linkProgram = glLinkProgram;
-    GL::validateProgram = glValidateProgram;
-    GL::deleteShader = glDeleteShader;
-    GL::deleteProgram = glDeleteProgram;
-    GL::useProgram = glUseProgram;
-    GL::getUniformLocation = glGetUniformLocation;
-    GL::uniform1f = glUniform1f;
-    GL::uniform1i = glUniform1i;
-    GL::uniform2f = glUniform2f;
-    GL::uniform2i = glUniform2i;
-    GL::uniform3f = glUniform3f;
-    GL::uniform3i = glUniform3i;
-    GL::uniform4f = glUniform4f;
-    GL::uniform4i = glUniform4i;
-    GL::uniformMatrix4fv = glUniformMatrix4fv;
-    GL::getAttribLocation = glGetAttribLocation;
-
-    GL::enableVertexAttribArray = glEnableVertexAttribArray;
+    GL::activeTexture            = glActiveTexture;
+    GL::genFramebuffers          = glGenFramebuffers;
+    GL::deleteFramebuffers       = glDeleteFramebuffers;
+    GL::bindFramebuffer          = glBindFramebuffer;
+    GL::checkFramebufferStatus   = glCheckFramebufferStatus;
+    GL::framebufferTexture2D     = glFramebufferTexture2D;
+    GL::generateMipmap           = glGenerateMipmap;
+
+    GL::bindBuffer               = glBindBuffer;
+    GL::deleteBuffers            = glDeleteBuffers;
+    GL::genBuffers               = glGenBuffers;
+    GL::bufferData               = glBufferData;
+    GL::bufferSubData            = glBufferSubData;
+
+    GL::getShaderiv              = glGetShaderiv;
+    GL::getShaderInfoLog         = glGetShaderInfoLog;
+    GL::getProgramiv             = glGetProgramiv;
+    GL::getProgramInfoLog        = glGetProgramInfoLog;
+    GL::createShader             = glCreateShader;
+    GL::shaderSource             = (GL::GLShaderSourceProc) glShaderSource;
+    GL::compileShader            = glCompileShader;
+    GL::createProgram            = glCreateProgram;
+    GL::attachShader             = glAttachShader;
+    GL::linkProgram              = glLinkProgram;
+    GL::validateProgram          = glValidateProgram;
+    GL::deleteShader             = glDeleteShader;
+    GL::deleteProgram            = glDeleteProgram;
+    GL::useProgram               = glUseProgram;
+    GL::getUniformLocation       = glGetUniformLocation;
+    GL::uniform1f                = glUniform1f;
+    GL::uniform1i                = glUniform1i;
+    GL::uniform2f                = glUniform2f;
+    GL::uniform2i                = glUniform2i;
+    GL::uniform3f                = glUniform3f;
+    GL::uniform3i                = glUniform3i;
+    GL::uniform4f                = glUniform4f;
+    GL::uniform4i                = glUniform4i;
+    GL::uniformMatrix4fv         = glUniformMatrix4fv;
+    GL::getAttribLocation        = glGetAttribLocation;
+
+    GL::enableVertexAttribArray  = glEnableVertexAttribArray;
     GL::disableVertexAttribArray = glDisableVertexAttribArray;
-    GL::vertexAttribPointer = glVertexAttribPointer;
+    GL::vertexAttribPointer      = glVertexAttribPointer;
 
-    GL::genRenderbuffers = glGenRenderbuffers;
-    GL::deleteRenderbuffers = glDeleteRenderbuffers;
-    GL::bindRenderbuffer = glBindRenderbuffer;
-    GL::framebufferRenderbuffer = glFramebufferRenderbuffer;
-    GL::renderbufferStorage = glRenderbufferStorage;
+    GL::genRenderbuffers         = glGenRenderbuffers;
+    GL::deleteRenderbuffers      = glDeleteRenderbuffers;
+    GL::bindRenderbuffer         = glBindRenderbuffer;
+    GL::framebufferRenderbuffer  = glFramebufferRenderbuffer;
+    GL::renderbufferStorage      = glRenderbufferStorage;
 
     glClearColor (0.0, 0.0, 0.0, 1.0);
     glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-    glEnable (GL_BLEND);
+
+    GLboolean glBlendEnabled = glIsEnabled (GL_BLEND);
+
+    if (!glBlendEnabled)
+	glEnable (GL_BLEND);
+
     glEnable (GL_CULL_FACE);
 
     priv->updateView ();
@@ -612,15 +640,16 @@
 
     #else
 
-    Display		 *dpy = screen->dpy ();
-    const char		 *glExtensions;
-    GLfloat		 globalAmbient[]  = { 0.1f, 0.1f,  0.1f, 0.1f };
-    GLfloat		 ambientLight[]   = { 0.0f, 0.0f,  0.0f, 0.0f };
-    GLfloat		 diffuseLight[]   = { 0.9f, 0.9f,  0.9f, 0.9f };
-    GLfloat		 light0Position[] = { -0.5f, 0.5f, -9.0f, 1.0f };
+    Display            *dpy = screen->dpy ();
+    const char         *glExtensions;
+    GLfloat            globalAmbient[]  = { 0.1f, 0.1f,  0.1f, 0.1f };
+    GLfloat            ambientLight[]   = { 0.0f, 0.0f,  0.0f, 0.0f };
+    GLfloat            diffuseLight[]   = { 0.9f, 0.9f,  0.9f, 0.9f };
+    GLfloat            light0Position[] = { -0.5f, 0.5f, -9.0f, 1.0f };
     CompOption::Vector o (0);
 
     priv->ctx = glXCreateContext (dpy, visinfo, NULL, True);
+
     if (!priv->ctx)
     {
 	compLogMessage ("opengl", CompLogLevelWarn,
@@ -648,6 +677,7 @@
     glXMakeCurrent (dpy, CompositeScreen::get (screen)->output (), priv->ctx);
 
     glExtensions = (const char *) glGetString (GL_EXTENSIONS);
+
     if (!glExtensions)
     {
 	compLogMessage ("opengl", CompLogLevelFatal,
@@ -656,13 +686,13 @@
 	return false;
     }
 
-    const char *glVendor = (const char *) glGetString (GL_VENDOR);
+    const char *glVendor   = (const char *) glGetString (GL_VENDOR);
     const char *glRenderer = (const char *) glGetString (GL_RENDERER);
-    const char *glVersion = (const char *) glGetString (GL_VERSION);
+    const char *glVersion  = (const char *) glGetString (GL_VERSION);
 
-    priv->glVendor = glVendor;
+    priv->glVendor   = glVendor;
     priv->glRenderer = glRenderer;
-    priv->glVersion = glVersion;
+    priv->glVersion  = glVersion;
 
     if (glRenderer != NULL &&
 	(strcmp (glRenderer, "Software Rasterizer") == 0 ||
@@ -675,8 +705,9 @@
 	return false;
     }
 
-    priv->commonFrontbuffer = true;
+    priv->commonFrontbuffer    = true;
     priv->incorrectRefreshRate = false;
+
     if (glRenderer != NULL && strstr (glRenderer, "on llvmpipe"))
     {
 	/*
@@ -691,7 +722,7 @@
 
     if (glVendor != NULL && strstr (glVendor, "NVIDIA"))
     {
-	/*
+	/* TODO: Check if this is still necessary:
 	 * NVIDIA provides an incorrect refresh rate, we need to
 	 * force 60Hz */
 	priv->incorrectRefreshRate = true;
@@ -699,6 +730,7 @@
 
     if (strstr (glExtensions, "GL_ARB_texture_non_power_of_two"))
 	GL::textureNonPowerOfTwo = true;
+
     GL::textureNonPowerOfTwoMipmap = GL::textureNonPowerOfTwo;
 
     glGetIntegerv (GL_MAX_TEXTURE_SIZE, &GL::maxTextureSize);
@@ -714,6 +746,7 @@
 	    GLint maxTextureSize;
 
 	    glGetIntegerv (GL_MAX_RECTANGLE_TEXTURE_SIZE_NV, &maxTextureSize);
+
 	    if (maxTextureSize > GL::maxTextureSize)
 		GL::maxTextureSize = maxTextureSize;
 	}
@@ -731,7 +764,7 @@
     {
 	GL::textureEnvCombine = true;
 
-	/* XXX: GL_NV_texture_env_combine4 need special code but it seams to
+	/* XXX: GL_NV_texture_env_combine4 need special code but it seems to
 	   be working anyway for now... */
 	if (strstr (glExtensions, "GL_ARB_texture_env_crossbar") ||
 	    strstr (glExtensions, "GL_NV_texture_env_combine4"))
@@ -743,6 +776,7 @@
 	GL::textureBorderClamp = true;
 
     GL::maxTextureUnits = 1;
+
     if (strstr (glExtensions, "GL_ARB_multitexture"))
     {
 	GL::activeTexture = (GL::GLActiveTextureProc)
@@ -781,18 +815,17 @@
 	GL::renderbufferStorage = (GL::GLRenderbufferStorageProc)
 	    getProcAddress ("glRenderbufferStorageEXT");
 
-	if (GL::genFramebuffers        &&
-	    GL::deleteFramebuffers     &&
-	    GL::bindFramebuffer        &&
-	    GL::checkFramebufferStatus &&
-	    GL::framebufferTexture2D   &&
-	    GL::generateMipmap          &&
-	    GL::genRenderbuffers        &&
-	    GL::deleteRenderbuffers     &&
-	    GL::bindRenderbuffer        &&
-	    GL::framebufferRenderbuffer &&
-	    GL::renderbufferStorage
-	    )
+	if (GL::genFramebuffers		&&
+	    GL::deleteFramebuffers	&&
+	    GL::bindFramebuffer		&&
+	    GL::checkFramebufferStatus	&&
+	    GL::framebufferTexture2D	&&
+	    GL::generateMipmap		&&
+	    GL::genRenderbuffers	&&
+	    GL::deleteRenderbuffers	&&
+	    GL::bindRenderbuffer	&&
+	    GL::framebufferRenderbuffer	&&
+	    GL::renderbufferStorage)
 	    GL::fboSupported = true;
     }
 
@@ -822,53 +855,53 @@
 
     priv->updateRenderMode ();
 
-    if (strstr (glExtensions, "GL_ARB_fragment_shader") &&
-        strstr (glExtensions, "GL_ARB_vertex_shader") &&
-	strstr (glExtensions, "GL_ARB_shader_objects") &&
+    if (strstr (glExtensions, "GL_ARB_fragment_shader")	&&
+	strstr (glExtensions, "GL_ARB_vertex_shader")	&&
+	strstr (glExtensions, "GL_ARB_shader_objects")	&&
 	strstr (glExtensions, "GL_ARB_shading_language_100"))
     {
-	GL::getShaderiv = (GL::GLGetShaderivProc) GL::getShaderivARBWrapper;
-	GL::getShaderInfoLog = (GL::GLGetShaderInfoLogProc) GL::getShaderInfoLogARBWrapper;
-	GL::getProgramiv = (GL::GLGetProgramivProc) GL::getProgramivARBWrapper;
-	GL::getProgramInfoLog = (GL::GLGetProgramInfoLogProc) GL::getProgramInfoLogARBWrapper;
-	GL::getObjectParameteriv = (GL::GLGetObjectParameterivProc) getProcAddress ("glGetObjectParameterivARB");
-	GL::getInfoLog = (GL::GLGetInfoLogProc) getProcAddress ("glGetInfoLogARB");
-	GL::createShader = (GL::GLCreateShaderProc) GL::createShaderARBWrapper;
-	GL::createShaderObjectARB = (GL::GLCreateShaderObjectARBProc) getProcAddress ("glCreateShaderObjectARB");
-	GL::shaderSource = (GL::GLShaderSourceProc) GL::shaderSourceARBWrapper;
-	GL::shaderSourceARB = (GL::GLShaderSourceARBProc) getProcAddress ("glShaderSourceARB");
-	GL::compileShader = (GL::GLCompileShaderProc) GL::compileShaderARBWrapper;
-	GL::compileShaderARB = (GL::GLCompileShaderARBProc) getProcAddress ("glCompileShaderARB");
-	GL::createProgram = (GL::GLCreateProgramProc) GL::createProgramARBWrapper;
-	GL::createProgramObjectARB = (GL::GLCreateProgramObjectARBProc) getProcAddress ("glCreateProgramObjectARB");
-	GL::attachShader = GL::attachShaderARBWrapper;
-	GL::attachObjectARB = (GL::GLAttachObjectARBProc) getProcAddress ("glAttachObjectARB");
-	GL::linkProgram = GL::linkProgramARBWrapper;
-	GL::linkProgramARB = (GL::GLLinkProgramARBProc) getProcAddress ("glLinkProgramARB");
-	GL::validateProgram = GL::validateProgramARBWrapper;
-	GL::validateProgramARB = (GL::GLValidateProgramARBProc) getProcAddress ("glValidateProgramARB");
-	GL::deleteShader = GL::deleteShaderARBWrapper;
-	GL::deleteProgram = GL::deleteProgramARBWrapper;
-	GL::deleteObjectARB = (GL::GLDeleteObjectARBProc) getProcAddress ("glDeleteObjectARB");
-	GL::useProgram = GL::useProgramARBWrapper;
-	GL::useProgramObjectARB = (GL::GLUseProgramObjectARBProc) getProcAddress ("glUseProgramObjectARB");
-	GL::getUniformLocation = GL::getUniformLocationARBWrapper;
-	GL::getUniformLocationARB = (GL::GLGetUniformLocationARBProc) getProcAddress ("glGetUniformLocationARB");
-	GL::uniform1f = (GL::GLUniform1fProc) getProcAddress ("glUniform1fARB");
-	GL::uniform1i = (GL::GLUniform1iProc) getProcAddress ("glUniform1iARB");
-	GL::uniform2f = (GL::GLUniform2fProc) getProcAddress ("glUniform2fARB");
-	GL::uniform2i = (GL::GLUniform2iProc) getProcAddress ("glUniform2iARB");
-	GL::uniform3f = (GL::GLUniform3fProc) getProcAddress ("glUniform3fARB");
-	GL::uniform3i = (GL::GLUniform3iProc) getProcAddress ("glUniform3iARB");
-	GL::uniform4f = (GL::GLUniform4fProc) getProcAddress ("glUniform4fARB");
-	GL::uniform4i = (GL::GLUniform4iProc) getProcAddress ("glUniform4iARB");
-	GL::uniformMatrix4fv = (GL::GLUniformMatrix4fvProc) getProcAddress ("glUniformMatrix4fvARB");
-	GL::getAttribLocation = (GL::GLGetAttribLocationProc) GL::getAttribLocationARBWrapper;
-	GL::getAttribLocationARB = (GL::GLGetAttribLocationARBProc) getProcAddress ("glGetAttribLocationARB");
+	GL::getShaderiv              = (GL::GLGetShaderivProc)              GL::getShaderivARBWrapper;
+	GL::getShaderInfoLog         = (GL::GLGetShaderInfoLogProc)         GL::getShaderInfoLogARBWrapper;
+	GL::getProgramiv             = (GL::GLGetProgramivProc)             GL::getProgramivARBWrapper;
+	GL::getProgramInfoLog        = (GL::GLGetProgramInfoLogProc)        GL::getProgramInfoLogARBWrapper;
+	GL::getObjectParameteriv     = (GL::GLGetObjectParameterivProc)     getProcAddress ("glGetObjectParameterivARB");
+	GL::getInfoLog               = (GL::GLGetInfoLogProc)               getProcAddress ("glGetInfoLogARB");
+	GL::createShader             = (GL::GLCreateShaderProc)             GL::createShaderARBWrapper;
+	GL::createShaderObjectARB    = (GL::GLCreateShaderObjectARBProc)    getProcAddress ("glCreateShaderObjectARB");
+	GL::shaderSource             = (GL::GLShaderSourceProc)             GL::shaderSourceARBWrapper;
+	GL::shaderSourceARB          = (GL::GLShaderSourceARBProc)          getProcAddress ("glShaderSourceARB");
+	GL::compileShader            = (GL::GLCompileShaderProc)            GL::compileShaderARBWrapper;
+	GL::compileShaderARB         = (GL::GLCompileShaderARBProc)         getProcAddress ("glCompileShaderARB");
+	GL::createProgram            = (GL::GLCreateProgramProc)            GL::createProgramARBWrapper;
+	GL::createProgramObjectARB   = (GL::GLCreateProgramObjectARBProc)   getProcAddress ("glCreateProgramObjectARB");
+	GL::attachShader             = GL::attachShaderARBWrapper;
+	GL::attachObjectARB          = (GL::GLAttachObjectARBProc)          getProcAddress ("glAttachObjectARB");
+	GL::linkProgram              = GL::linkProgramARBWrapper;
+	GL::linkProgramARB           = (GL::GLLinkProgramARBProc)           getProcAddress ("glLinkProgramARB");
+	GL::validateProgram          = GL::validateProgramARBWrapper;
+	GL::validateProgramARB       = (GL::GLValidateProgramARBProc)       getProcAddress ("glValidateProgramARB");
+	GL::deleteShader             = GL::deleteShaderARBWrapper;
+	GL::deleteProgram            = GL::deleteProgramARBWrapper;
+	GL::deleteObjectARB          = (GL::GLDeleteObjectARBProc)          getProcAddress ("glDeleteObjectARB");
+	GL::useProgram               = GL::useProgramARBWrapper;
+	GL::useProgramObjectARB      = (GL::GLUseProgramObjectARBProc)      getProcAddress ("glUseProgramObjectARB");
+	GL::getUniformLocation       = GL::getUniformLocationARBWrapper;
+	GL::getUniformLocationARB    = (GL::GLGetUniformLocationARBProc)    getProcAddress ("glGetUniformLocationARB");
+	GL::uniform1f                = (GL::GLUniform1fProc)                getProcAddress ("glUniform1fARB");
+	GL::uniform1i                = (GL::GLUniform1iProc)                getProcAddress ("glUniform1iARB");
+	GL::uniform2f                = (GL::GLUniform2fProc)                getProcAddress ("glUniform2fARB");
+	GL::uniform2i                = (GL::GLUniform2iProc)                getProcAddress ("glUniform2iARB");
+	GL::uniform3f                = (GL::GLUniform3fProc)                getProcAddress ("glUniform3fARB");
+	GL::uniform3i                = (GL::GLUniform3iProc)                getProcAddress ("glUniform3iARB");
+	GL::uniform4f                = (GL::GLUniform4fProc)                getProcAddress ("glUniform4fARB");
+	GL::uniform4i                = (GL::GLUniform4iProc)                getProcAddress ("glUniform4iARB");
+	GL::uniformMatrix4fv         = (GL::GLUniformMatrix4fvProc)         getProcAddress ("glUniformMatrix4fvARB");
+	GL::getAttribLocation        = (GL::GLGetAttribLocationProc)        GL::getAttribLocationARBWrapper;
+	GL::getAttribLocationARB     = (GL::GLGetAttribLocationARBProc)     getProcAddress ("glGetAttribLocationARB");
 
-	GL::enableVertexAttribArray = (GL::GLEnableVertexAttribArrayProc) getProcAddress ("glEnableVertexAttribArrayARB");
+	GL::enableVertexAttribArray  = (GL::GLEnableVertexAttribArrayProc)  getProcAddress ("glEnableVertexAttribArrayARB");
 	GL::disableVertexAttribArray = (GL::GLDisableVertexAttribArrayProc) getProcAddress ("glDisableVertexAttribArrayARB");
-	GL::vertexAttribPointer = (GL::GLVertexAttribPointerProc) getProcAddress ("glVertexAttribPointerARB");
+	GL::vertexAttribPointer      = (GL::GLVertexAttribPointerProc)      getProcAddress ("glVertexAttribPointerARB");
 
 	GL::shaders = true;
     }
@@ -886,6 +919,7 @@
     if (GL::textureEnvCombine && GL::maxTextureUnits >= 2)
     {
 	GL::canDoSaturated = true;
+
 	if (GL::textureEnvCrossbar && GL::maxTextureUnits >= 4)
 	    GL::canDoSlightlySaturated = true;
     }
@@ -905,7 +939,6 @@
 
     priv->lighting = false;
 
-
     priv->filter[NOTHING_TRANS_FILTER] = GLTexture::Fast;
     priv->filter[SCREEN_TRANS_FILTER]  = GLTexture::Good;
     priv->filter[WINDOW_TRANS_FILTER]  = GLTexture::Good;
@@ -936,13 +969,13 @@
     DetectionWorkaround workaround;
 #endif
 
-    XVisualInfo		 *visinfo = NULL;
+    XVisualInfo          *visinfo = NULL;
 #ifndef USE_GLES
-    Display		 *dpy = s->dpy ();
-    XVisualInfo		 templ;
-    GLXFBConfig		 *fbConfigs;
-    int			 defaultDepth, nvisinfo, nElements, value, i;
-    const char		 *glxExtensions;
+    Display              *dpy = s->dpy ();
+    XVisualInfo          templ;
+    GLXFBConfig          *fbConfigs;
+    int                  defaultDepth, nvisinfo, nElements, value;
+    const char           *glxExtensions;
     XWindowAttributes    attr;
     CompOption::Vector o (0);
 
@@ -956,6 +989,7 @@
     templ.visualid = XVisualIDFromVisual (attr.visual);
 
     visinfo = XGetVisualInfo (dpy, VisualIDMask, &templ, &nvisinfo);
+
     if (!nvisinfo)
     {
 	compLogMessage ("opengl", CompLogLevelFatal,
@@ -968,6 +1002,7 @@
     defaultDepth = visinfo->depth;
 
     glXGetConfig (dpy, visinfo, GLX_USE_GL, &value);
+
     if (!value)
     {
 	compLogMessage ("opengl", CompLogLevelFatal,
@@ -979,6 +1014,7 @@
     }
 
     glXGetConfig (dpy, visinfo, GLX_DOUBLEBUFFER, &value);
+
     if (!value)
     {
 	compLogMessage ("opengl", CompLogLevelFatal,
@@ -994,8 +1030,8 @@
     if (glxExtensions == NULL)
     {
 	compLogMessage ("opengl", CompLogLevelFatal,
-	                "glXQueryExtensionsString is NULL for screen %d",
-	                s->screenNum ());
+			"glXQueryExtensionsString is NULL for screen %d",
+			s->screenNum ());
 	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
 	setFailed ();
 	return;
@@ -1010,25 +1046,17 @@
 	return;
     }
 
-    priv->getProcAddress = (GL::GLXGetProcAddressProc)
-	getProcAddress ("glXGetProcAddressARB");
-    GL::bindTexImage = (GL::GLXBindTexImageProc)
-	getProcAddress ("glXBindTexImageEXT");
-    GL::releaseTexImage = (GL::GLXReleaseTexImageProc)
-	getProcAddress ("glXReleaseTexImageEXT");
-    GL::queryDrawable = (GL::GLXQueryDrawableProc)
-	getProcAddress ("glXQueryDrawable");
-    GL::getFBConfigs = (GL::GLXGetFBConfigsProc)
-	getProcAddress ("glXGetFBConfigs");
-    GL::getFBConfigAttrib = (GL::GLXGetFBConfigAttribProc)
-	getProcAddress ("glXGetFBConfigAttrib");
-    GL::createPixmap = (GL::GLXCreatePixmapProc)
-	getProcAddress ("glXCreatePixmap");
-    GL::destroyPixmap = (GL::GLXDestroyPixmapProc)
-    	getProcAddress ("glXDestroyPixmap");
+    priv->getProcAddress  = (GL::GLXGetProcAddressProc)    getProcAddress ("glXGetProcAddressARB");
+    GL::bindTexImage      = (GL::GLXBindTexImageProc)      getProcAddress ("glXBindTexImageEXT");
+    GL::releaseTexImage   = (GL::GLXReleaseTexImageProc)   getProcAddress ("glXReleaseTexImageEXT");
+    GL::queryDrawable     = (GL::GLXQueryDrawableProc)     getProcAddress ("glXQueryDrawable");
+    GL::getFBConfigs      = (GL::GLXGetFBConfigsProc)      getProcAddress ("glXGetFBConfigs");
+    GL::getFBConfigAttrib = (GL::GLXGetFBConfigAttribProc) getProcAddress ("glXGetFBConfigAttrib");
+    GL::createPixmap      = (GL::GLXCreatePixmapProc)      getProcAddress ("glXCreatePixmap");
+    GL::destroyPixmap     = (GL::GLXDestroyPixmapProc)     getProcAddress ("glXDestroyPixmap");
 
     if (!strstr (glxExtensions, "GLX_EXT_texture_from_pixmap") ||
-        !GL::bindTexImage || !GL::releaseTexImage)
+	!GL::bindTexImage || !GL::releaseTexImage)
     {
 	compLogMessage ("opengl", CompLogLevelFatal,
 			"GLX_EXT_texture_from_pixmap is missing");
@@ -1051,52 +1079,46 @@
     }
 
     if (strstr (glxExtensions, "GLX_MESA_copy_sub_buffer"))
-	GL::copySubBuffer = (GL::GLXCopySubBufferProc)
-	    getProcAddress ("glXCopySubBufferMESA");
+	GL::copySubBuffer = (GL::GLXCopySubBufferProc) getProcAddress ("glXCopySubBufferMESA");
 
     if (strstr (glxExtensions, "GLX_SGI_video_sync"))
     {
-	GL::getVideoSync = (GL::GLXGetVideoSyncProc)
-	    getProcAddress ("glXGetVideoSyncSGI");
-
-	GL::waitVideoSync = (GL::GLXWaitVideoSyncProc)
-	    getProcAddress ("glXWaitVideoSyncSGI");
+	GL::getVideoSync  = (GL::GLXGetVideoSyncProc)  getProcAddress ("glXGetVideoSyncSGI");
+	GL::waitVideoSync = (GL::GLXWaitVideoSyncProc) getProcAddress ("glXWaitVideoSyncSGI");
     }
 
     if (strstr (glxExtensions, "GLX_SGI_swap_control"))
     {
-	GL::swapInterval = (GL::GLXSwapIntervalProc)
-	    getProcAddress ("glXSwapIntervalSGI");
+	GL::swapInterval  = (GL::GLXSwapIntervalProc)  getProcAddress ("glXSwapIntervalSGI");
     }
 
     fbConfigs = (*GL::getFBConfigs) (dpy, s->screenNum (), &nElements);
 
     GL::stencilBuffer = false;
 
-    for (i = 0; i <= MAX_DEPTH; i++)
+    int         alpha;
+    int         db          = MAXSHORT;
+    int         stencil     = MAXSHORT;
+    int         depth       = MAXSHORT;
+    int         msaaBuffers = MAXSHORT;
+    int         msaaSamples = MAXSHORT;
+    int         mipmap      = 0;
+    int         rgba        = 0;
+    int         visualDepth;
+    XVisualInfo *vi;
+
+    for (int i = 0; i <= MAX_DEPTH; ++i)
     {
-	int j, db, stencil, depth, alpha, mipmap, msaaBuffers, msaaSamples, rgba;
-
 	priv->glxPixmapFBConfigs[i].fbConfig       = NULL;
 	priv->glxPixmapFBConfigs[i].mipmap         = 0;
 	priv->glxPixmapFBConfigs[i].yInverted      = 0;
 	priv->glxPixmapFBConfigs[i].textureFormat  = 0;
 	priv->glxPixmapFBConfigs[i].textureTargets = 0;
 
-	db          = MAXSHORT;
-	stencil     = MAXSHORT;
-	depth       = MAXSHORT;
-	msaaBuffers = MAXSHORT;
-	msaaSamples = MAXSHORT;
-	mipmap      = 0;
-	rgba        = 0;
-
-	for (j = 0; j < nElements; j++)
+	for (int j = 0; j < nElements; ++j)
 	{
-	    XVisualInfo *vi;
-	    int		visualDepth;
-
 	    vi = glXGetVisualFromFBConfig (dpy, fbConfigs[j]);
+
 	    if (vi == NULL)
 		continue;
 
@@ -1107,14 +1129,14 @@
 	    if (visualDepth != i)
 		continue;
 
-	    (*GL::getFBConfigAttrib) (dpy, fbConfigs[j],
-				      GLX_ALPHA_SIZE, &alpha);
-	    (*GL::getFBConfigAttrib) (dpy, fbConfigs[j],
-				      GLX_BUFFER_SIZE, &value);
+	    (*GL::getFBConfigAttrib) (dpy, fbConfigs[j], GLX_ALPHA_SIZE, &alpha);
+	    (*GL::getFBConfigAttrib) (dpy, fbConfigs[j], GLX_BUFFER_SIZE, &value);
+
 	    if (value != i && (value - alpha) != i)
 		continue;
 
 	    value = 0;
+
 	    if (i == 32)
 	    {
 		(*GL::getFBConfigAttrib) (dpy, fbConfigs[j],
@@ -1167,14 +1189,14 @@
 	    (*GL::getFBConfigAttrib) (dpy, fbConfigs[j],
 				      GLX_SAMPLE_BUFFERS, &value);
 	    if (value > msaaBuffers)
-	        continue;
+		continue;
 
 	    msaaBuffers = value;
 
 	    (*GL::getFBConfigAttrib) (dpy, fbConfigs[j],
 				      GLX_SAMPLES, &value);
 	    if (value > msaaSamples)
-	        continue;
+		continue;
 
 	    msaaSamples = value;
 
@@ -1194,14 +1216,12 @@
 				      GLX_BIND_TO_TEXTURE_TARGETS_EXT, &value);
 
 	    priv->glxPixmapFBConfigs[i].textureTargets = value;
-
-	    priv->glxPixmapFBConfigs[i].fbConfig = fbConfigs[j];
-	    priv->glxPixmapFBConfigs[i].mipmap   = mipmap;
+	    priv->glxPixmapFBConfigs[i].fbConfig       = fbConfigs[j];
+	    priv->glxPixmapFBConfigs[i].mipmap         = mipmap;
 	}
 
-	if (i == defaultDepth)
-	    if (stencil != MAXSHORT)
-		GL::stencilBuffer = true;
+	if (i == defaultDepth && stencil != MAXSHORT)
+	    GL::stencilBuffer = true;
     }
 
     if (nElements)
@@ -1227,12 +1247,14 @@
 	CompositeScreen::get (screen)->unregisterPaintHandler ();
 
     #ifdef USE_GLES
-    Display *xdpy = screen->dpy ();
-    EGLDisplay dpy = eglGetDisplay (xdpy);
+    Display    *xdpy = screen->dpy ();
+    EGLDisplay dpy   = eglGetDisplay (xdpy);
 
     eglMakeCurrent (dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+
     if (priv->ctx != EGL_NO_CONTEXT)
 	eglDestroyContext (dpy, priv->ctx);
+
     eglDestroySurface (dpy, priv->surface);
     eglTerminate (dpy);
     eglReleaseThread ();
@@ -1248,12 +1270,14 @@
     delete priv;
 }
 
-PrivateGLScreen::PrivateGLScreen (GLScreen   *gs) :
+PrivateGLScreen::PrivateGLScreen (GLScreen *gs) :
     gScreen (gs),
     cScreen (CompositeScreen::get (screen)),
     textureFilter (GL_LINEAR),
+    glxPixmapFBConfigs (),
     backgroundTextures (),
     backgroundLoaded (false),
+    filter (),
     rasterPos (0, 0),
     projection (NULL),
     clearBuffers (true),
@@ -1268,15 +1292,17 @@
     #endif
     scratchFbo (NULL),
     outputRegion (),
+    lastViewport (),
     refreshSubBuffer (false),
     lastMask (0),
     bindPixmap (),
     hasCompositing (false),
     commonFrontbuffer (true),
     incorrectRefreshRate (false),
+    saveWindow (),
     programCache (new GLProgramCache (30)),
     shaderCache (),
-    autoProgram (new GLScreenAutoProgram(gs)),
+    autoProgram (new GLScreenAutoProgram (gs)),
     rootPixmapCopy (None),
     rootPixmapSize (),
     glVendor (NULL),
@@ -1293,15 +1319,13 @@
     delete projection;
     delete programCache;
     delete autoProgram;
+
     if (rootPixmapCopy)
 	XFreePixmap (screen->dpy (), rootPixmapCopy);
-
 }
 
 GLushort defaultColor[4] = { 0xffff, 0xffff, 0xffff, 0xffff };
 
-
-
 GLenum
 GLScreen::textureFilter ()
 {
@@ -1321,11 +1345,14 @@
 
     screen->handleEvent (event);
 
-    switch (event->type) {
+    switch (event->type)
+    {
 	case ConfigureNotify:
 	    if (event->xconfigure.window == screen->root ())
 		updateScreenBackground ();
+
 	    break;
+
 	case PropertyNotify:
 	    if (event->xproperty.atom == Atoms::xBackground[0] ||
 		event->xproperty.atom == Atoms::xBackground[1])
@@ -1338,15 +1365,18 @@
 		     event->xproperty.atom == Atoms::winSaturation)
 	    {
 		w = screen->findWindow (event->xproperty.window);
+
 		if (w)
 		    GLWindow::get (w)->updatePaintAttribs ();
 	    }
 	    else if (event->xproperty.atom == Atoms::wmIcon)
 	    {
 		w = screen->findWindow (event->xproperty.window);
+
 		if (w)
 		    GLWindow::get (w)->priv->icons.clear ();
 	    }
+
 	    break;
 
 	default:
@@ -1362,9 +1392,7 @@
 		    boundPixmapTex.find (de->damage);
 		#endif
 		if (it != boundPixmapTex.end ())
-		{
 		    it->second->damaged = true;
-		}
 
 		/* XXX: It would be nice if we could also update
 		 * the background of the root window when the root
@@ -1374,6 +1402,7 @@
 		 * be recopying the root window pixmap all the time
 		 * which is no good, so don't do that */
 	    }
+
 	    break;
     }
 }
@@ -1384,7 +1413,6 @@
     clearOutput (targetOutput, mask);
 }
 
-
 static void
 frustum (GLfloat *m,
 	 GLfloat left,
@@ -1394,14 +1422,12 @@
 	 GLfloat nearval,
 	 GLfloat farval)
 {
-    GLfloat x, y, a, b, c, d;
-
-    x = (2.0 * nearval) / (right - left);
-    y = (2.0 * nearval) / (top - bottom);
-    a = (right + left) / (right - left);
-    b = (top + bottom) / (top - bottom);
-    c = -(farval + nearval) / ( farval - nearval);
-    d = -(2.0 * farval * nearval) / (farval - nearval);
+    GLfloat x = (2.0 * nearval) / (right - left);
+    GLfloat y = (2.0 * nearval) / (top - bottom);
+    GLfloat a = (right + left) / (right - left);
+    GLfloat b = (top + bottom) / (top - bottom);
+    GLfloat c = -(farval + nearval) / (farval - nearval);
+    GLfloat d = -(2.0 * farval * nearval) / (farval - nearval);
 
 #define M(row,col)  m[col * 4 + row]
     M(0,0) = x;     M(0,1) = 0.0f;  M(0,2) = a;      M(0,3) = 0.0f;
@@ -1419,12 +1445,10 @@
 	     GLfloat zNear,
 	     GLfloat zFar)
 {
-    GLfloat xmin, xmax, ymin, ymax;
-
-    ymax = zNear * tan (fovy * M_PI / 360.0);
-    ymin = -ymax;
-    xmin = ymin * aspect;
-    xmax = ymax * aspect;
+    GLfloat ymax = zNear * tan (fovy * M_PI / 360.0);
+    GLfloat ymin = -ymax;
+    GLfloat xmin = ymin * aspect;
+    GLfloat xmax = ymax * aspect;
 
     frustum (m, xmin, xmax, ymin, ymax, zNear, zFar);
 }
@@ -1450,6 +1474,7 @@
 
     if (projection != NULL)
 	delete projection;
+
     projection = new GLMatrix (projection_array);
 
     #ifndef USE_GLES
@@ -1478,6 +1503,7 @@
 
     if (scratchFbo)
 	scratchFbo->allocate (*screen, NULL, GL_BGRA);
+
     updateView ();
 }
 
@@ -1500,6 +1526,7 @@
 	{
 	    dlerror ();
 	    funcPtr = (GL::FuncPtr) dlsym (dlhand, name);
+
 	    if (dlerror () != NULL)
 		funcPtr = NULL;
 	}
@@ -1512,18 +1539,18 @@
 void
 PrivateGLScreen::updateScreenBackground ()
 {
-    Display	  *dpy = screen->dpy ();
-    Atom	  pixmapAtom, actualType;
-    int		  actualFormat, i, status;
+    Display       *dpy = screen->dpy ();
+    Atom          actualType;
+    int           actualFormat, status;
     unsigned int  width = 1, height = 1, depth = 0;
     unsigned long nItems;
     unsigned long bytesAfter;
     unsigned char *prop;
-    Pixmap	  pixmap = None;
-
-    pixmapAtom = XInternAtom (dpy, "PIXMAP", false);
-
-    for (i = 0; pixmap == 0 && i < 2; i++)
+    Pixmap        pixmap = None;
+
+    Atom pixmapAtom = XInternAtom (dpy, "PIXMAP", false);
+
+    for (int i = 0; pixmap == 0 && i < 2; ++i)
     {
 	status = XGetWindowProperty (dpy, screen->root (),
 				     Atoms::xBackground[i],
@@ -1544,15 +1571,13 @@
 		if (p)
 		{
 		    unsigned int ui;
-		    int		 i;
-		    Window	 w;
+		    int          i;
+		    Window       w;
 
 		    if (XGetGeometry (dpy, p, &w, &i, &i,
-				      &width, &height, &ui, &depth))
-		    {
-			if ((int) depth == screen->attrib ().depth)
-			    pixmap = p;
-		    }
+				      &width, &height, &ui, &depth) &&
+			(int) depth == screen->attrib ().depth)
+			pixmap = p;
 		}
 	    }
 
@@ -1564,17 +1589,14 @@
     {
 	backgroundTextures =
 	    GLTexture::bindPixmapToTexture (pixmap, width, height, depth);
+
 	if (backgroundTextures.empty ())
-	{
 	    compLogMessage ("core", CompLogLevelWarn,
 			    "Couldn't bind background pixmap 0x%x to "
 			    "texture", (int) pixmap);
-	}
     }
     else
-    {
 	backgroundTextures.clear ();
-    }
 
     if (backgroundTextures.empty ())
     {
@@ -1584,7 +1606,7 @@
 	GC        gc;
 
 	gcv.graphics_exposures = false;
-	gcv.subwindow_mode = IncludeInferiors;
+	gcv.subwindow_mode     = IncludeInferiors;
 	gc = XCreateGC (screen->dpy (), screen->root (),
 			GCGraphicsExposures | GCSubwindowMode, &gcv);
 
@@ -1605,11 +1627,9 @@
 					    DefaultDepth (screen->dpy (), DefaultScreen (screen->dpy ())));
 
 	    if (backgroundTextures.empty ())
-	    {
 		compLogMessage ("core", CompLogLevelWarn,
 				"Couldn't bind background pixmap 0x%x to "
 				"texture", (int) screen->width ());
-	    }
 	}
 
 	if (rootPixmapCopy)
@@ -1619,9 +1639,7 @@
 	    XSync (screen->dpy (), false);
 	}
 	else
-	{
 	    backgroundTextures.clear ();
-	}
 
 	XFreeGC(dpy, gc);
     }
@@ -1711,7 +1729,7 @@
 void
 GLScreenInterface::glBufferStencil(const GLMatrix &matrix,
 				   GLVertexBuffer &vertexBuffer,
-				   CompOutput *output)
+				   CompOutput     *output)
     WRAPABLE_DEF (glBufferStencil, matrix, vertexBuffer, output)
 
 GLMatrix *
@@ -1747,7 +1765,8 @@
 }
 
 void
-GLScreen::setFilter (int num, GLTexture::Filter filter)
+GLScreen::setFilter (int               num,
+		     GLTexture::Filter filter)
 {
     priv->filter[num] = filter;
 }
@@ -1766,9 +1785,9 @@
 {
     BoxPtr pBox = &output->region ()->extents;
 
-    if (pBox->x1 != 0	     ||
-	pBox->y1 != 0	     ||
-	pBox->x2 != (int) screen->width () ||
+    if (pBox->x1 != 0			    ||
+	pBox->y1 != 0			    ||
+	pBox->x2 != (int) screen->width ()  ||
 	pBox->y2 != (int) screen->height ())
     {
 	glEnable (GL_SCISSOR_TEST);
@@ -1780,9 +1799,7 @@
 	glDisable (GL_SCISSOR_TEST);
     }
     else
-    {
 	glClear (mask);
-    }
 }
 
 void
@@ -1825,7 +1842,7 @@
 				const compiz::opengl::impl::GLXSwapIntervalEXTFunc  &swapIntervalFunc,
 				const compiz::opengl::impl::GLXWaitVideoSyncSGIFunc &waitVideoSyncFunc) :
     compiz::opengl::DoubleBuffer (swapIntervalFunc, waitVideoSyncFunc),
-    mDpy (d),
+    mDpy  (d),
     mSize (s)
 {
 }
@@ -1914,6 +1931,7 @@
     glLoadIdentity ();
 
     glDrawBuffer (GL_FRONT);
+
     foreach (const CompRect &r, blitRects)
     {
 	int x = r.x1 ();
@@ -1921,6 +1939,7 @@
 	glRasterPos2i (x, y);
 	glCopyPixels (x, y, w, h, GL_COLOR);
     }
+
     glDrawBuffer (GL_BACK);
 
     glPopMatrix ();
@@ -1929,7 +1948,6 @@
     glMatrixMode (GL_MODELVIEW);
 
     glFlush ();
-
 }
 
 #else
@@ -1960,7 +1978,7 @@
 EGLDoubleBuffer::blit (const CompRegion &region) const
 {
     CompRect::vector blitRects (region.rects ());
-    int		     y = 0;
+    int              y = 0;
 
     foreach (const CompRect &r, blitRects)
     {
@@ -1997,35 +2015,45 @@
 			       unsigned int        mask,
 			       const CompRegion    &region)
 {
-    if (clearBuffers)
-    {
-	if (mask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK)
-	    glClear (GL_COLOR_BUFFER_BIT);
-    }
+    if (clearBuffers &&
+	mask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK)
+	glClear (GL_COLOR_BUFFER_BIT);
 
     // Disable everything that we don't usually need and could slow us down
-    glDisable (GL_BLEND);
-    glDisable (GL_STENCIL_TEST);
-    glDisable (GL_DEPTH_TEST);
+    GLboolean glBlendEnabled   = glIsEnabled (GL_BLEND);
+    GLboolean glStencilEnabled = glIsEnabled (GL_STENCIL_TEST);
+    GLboolean glDepthEnabled   = glIsEnabled (GL_DEPTH_TEST);
+
+    // just disable global states if they are enabled
+    if (glBlendEnabled)
+	glDisable (GL_BLEND);
+
+    if (glStencilEnabled)
+	glDisable (GL_STENCIL_TEST);
+
+    if (glDepthEnabled)
+	glDisable (GL_DEPTH_TEST);
+
     glDepthMask (GL_FALSE);
     glStencilMask (0);
 
     GLFramebufferObject *oldFbo = NULL;
-    bool useFbo = false;
+    bool                useFbo  = false;
 
     /* Clear the color buffer where appropriate */
     if (GL::fboEnabled && scratchFbo)
     {
 	oldFbo = scratchFbo->bind ();
 	useFbo = scratchFbo->checkStatus () && scratchFbo->tex ();
+
 	if (!useFbo)
 	    GLFramebufferObject::rebind (oldFbo);
     }
 
 #ifdef UNSAFE_ARM_SGX_FIXME
-    refreshSubBuffer = ((lastMask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK) &&
-                        !(mask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK) &&
-                        (mask & COMPOSITE_SCREEN_DAMAGE_REGION_MASK));
+    refreshSubBuffer = ((lastMask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK)	&&
+			!(mask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK)	&&
+			(mask & COMPOSITE_SCREEN_DAMAGE_REGION_MASK));
 
     if (refreshSubBuffer)
     {
@@ -2035,16 +2063,18 @@
 	// Posting a fullscreen damage region to the SGX seems to reset the
 	// framebuffer, causing the screen to blackout.
 	cScreen->damageRegion (CompRegion (screen->fullscreenOutput ()) -
-                               CompRegion (CompRect(0, 0, 1, 1)));
+			       CompRegion (CompRect(0, 0, 1, 1)));
     }
 #endif
 
     CompRegion tmpRegion = (mask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK) ?
-                           screen->region () : region;
+			       screen->region () : region;
+
+    XRectangle r;
+    GLMatrix   identity;
 
     foreach (CompOutput *output, outputs)
     {
-	XRectangle r;
 	targetOutput = output;
 
 	r.x	 = output->x1 ();
@@ -2063,8 +2093,6 @@
 
 	if (mask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK)
 	{
-	    GLMatrix identity;
-
 	    gScreen->glPaintOutput (defaultScreenPaintAttrib,
 				    identity,
 				    CompRegion (*output), output,
@@ -2073,8 +2101,6 @@
 	}
 	else if (mask & COMPOSITE_SCREEN_DAMAGE_REGION_MASK)
 	{
-	    GLMatrix identity;
-
 #ifdef UNSAFE_ARM_SGX_FIXME
 	    /*
 	     * FIXME:
@@ -2134,10 +2160,10 @@
     }
 
     bool alwaysSwap = optionGetAlwaysSwapBuffers ();
-    bool fullscreen = useFbo ||
-                      alwaysSwap ||
-                      ((mask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK) &&
-                       commonFrontbuffer);
+    bool fullscreen = useFbo	    ||
+		      alwaysSwap    ||
+		      ((mask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK) &&
+		       commonFrontbuffer);
 
     doubleBuffer.set (DoubleBuffer::VSYNC, optionGetSyncToVblank ());
     doubleBuffer.set (DoubleBuffer::HAVE_PERSISTENT_BACK_BUFFER, useFbo);
@@ -2184,6 +2210,7 @@
 {
     bool wasFboEnabled = GL::fboEnabled;
     updateRenderMode ();
+
     if (wasFboEnabled != GL::fboEnabled)
 	CompositeScreen::get (screen)->damageScreen ();
 }
@@ -2198,8 +2225,9 @@
     if (prevRegex != regex)
     {
 	prevBlacklisted = blacklisted (regex, glVendor, glRenderer, glVersion);
-	prevRegex = regex;
+	prevRegex       = regex;
     }
+
     return prevBlacklisted;
 }
 
@@ -2207,9 +2235,11 @@
 GLScreen::registerBindPixmap (GLTexture::BindPixmapProc proc)
 {
     priv->bindPixmap.push_back (proc);
+
     if (!priv->hasCompositing &&
 	CompositeScreen::get (screen)->registerPaintHandler (priv))
 	priv->hasCompositing = true;
+
     return priv->bindPixmap.size () - 1;
 }
 
@@ -2217,10 +2247,13 @@
 GLScreen::unregisterBindPixmap (GLTexture::BindPixmapHandle hnd)
 {
     bool hasBP = false;
+
     priv->bindPixmap[hnd].clear ();
-    for (unsigned int i = 0; i < priv->bindPixmap.size (); i++)
+
+    for (unsigned int i = 0; i < priv->bindPixmap.size (); ++i)
 	if (!priv->bindPixmap[i].empty ())
 	    hasBP = true;
+
     if (!hasBP && priv->hasCompositing)
     {
 	CompositeScreen::get (screen)->unregisterPaintHandler ();
@@ -2240,10 +2273,9 @@
     CompIcon *i = screen->defaultIcon ();
     CompSize size;
 
-    if (!i)
-	return NULL;
-
-    if (!i->width () || !i->height ())
+    if (!i		||
+	!i->width ()	||
+	!i->height ())
 	return NULL;
 
     if (priv->defaultIcon.icon == i)
@@ -2272,4 +2304,3 @@
     priv->rasterPos.setX (0);
     priv->rasterPos.setY (0);
 }
-
 
=== modified file 'plugins/opengl/src/shadercache.cpp'
--- plugins/opengl/src/shadercache.cpp	2013-01-09 10:45:16 +0000
+++ plugins/opengl/src/shadercache.cpp	2013-07-24 16:05:45 +0000
@@ -33,9 +33,10 @@
 class GLShaderParametersComparer
 {
 public:
+
     bool operator()(const GLShaderParameters &left, const GLShaderParameters &right) const
     {
-        return left.hash() < right.hash();
+	return left.hash() < right.hash();
     }
 
 };
@@ -48,6 +49,7 @@
 class PrivateShaderCache
 {
 public:
+
     PrivateShaderCache() {}
 
     ShaderMapType::const_iterator addShaderData(const GLShaderParameters &params);
@@ -65,12 +67,12 @@
 int
 GLShaderParameters::hash() const
 {
-    return static_cast<int>(opacity) |
-           (static_cast<int>(brightness) << 1) |
-           (static_cast<int>(saturation) << 2) |
-           (static_cast<int>(color) << 3) |
-           (static_cast<int>(normal) << 5) |
-           (static_cast<int>(numTextures) << 8);
+    return static_cast<int>(opacity)             |
+	    (static_cast<int>(brightness)  << 1) |
+	    (static_cast<int>(saturation)  << 2) |
+	    (static_cast<int>(color)       << 3) |
+	    (static_cast<int>(normal)      << 5) |
+	    (static_cast<int>(numTextures) << 8);
 }
 
 std::string
@@ -78,14 +80,15 @@
 {
     std::stringstream ss;
 
-    ss << (opacity ? "t" : "f");
+    ss << (opacity    ? "t" : "f");
     ss << (brightness ? "t" : "f");
     ss << (saturation ? "t" : "f");
-    ss << (color == GLShaderVariableNone ? "n" :
-           color == GLShaderVariableUniform ? "u" : "v");
-
-    ss << (normal == GLShaderVariableNone ? "n" :
-           normal == GLShaderVariableUniform ? "u" : "v");
+    ss << (color == GLShaderVariableNone ?
+		    "n" : color == GLShaderVariableUniform ? "u" : "v");
+
+    ss << (normal == GLShaderVariableNone ?
+		     "n" : normal == GLShaderVariableUniform ? "u" : "v");
+
     ss << numTextures;
 
     return ss.str();
@@ -113,7 +116,7 @@
     // Try to find a cached shader pair that matches the parameters.
     // If we don't have it cached, create it.
     if ((iter = priv->shaderMap.find (params)) == priv->shaderMap.end ())
-        iter = priv->addShaderData (params);
+	iter = priv->addShaderData (params);
 
     return iter->second;
 }
@@ -127,12 +130,13 @@
 {
     GLShaderData shaderData;
 
-    shaderData.name = params.id ();
+    shaderData.name           = params.id ();
     shaderData.fragmentShader = createFragmentShader (params);
-    shaderData.vertexShader = createVertexShader (params);
+    shaderData.vertexShader   = createVertexShader (params);
 
     std::pair<ShaderMapType::iterator, bool> ret =
-        shaderMap.insert(std::pair<GLShaderParameters, GLShaderData>(params,shaderData));
+	shaderMap.insert(std::pair<GLShaderParameters,
+			 GLShaderData>(params,shaderData));
 
     return ret.first;
 }
@@ -150,35 +154,35 @@
     std::stringstream ss;
 
     ss << "#ifdef GL_ES\n" <<
-          "precision mediump float;\n" <<
-          "#endif\n";
+	  "precision mediump float;\n" <<
+	  "#endif\n";
 
     ss << "uniform mat4 modelview;\n" <<
-          "uniform mat4 projection;\n";
+	  "uniform mat4 projection;\n";
 
     ss << "attribute vec3 position;\n" <<
-          "attribute vec3 normal;\n" <<
-          "attribute vec4 color;\n" <<
-          "attribute vec2 texCoord0;\n" <<
-          "attribute vec2 texCoord1;\n" <<
-          "attribute vec2 texCoord2;\n" <<
-          "attribute vec2 texCoord3;\n";
+	  "attribute vec3 normal;\n" <<
+	  "attribute vec4 color;\n" <<
+	  "attribute vec2 texCoord0;\n" <<
+	  "attribute vec2 texCoord1;\n" <<
+	  "attribute vec2 texCoord2;\n" <<
+	  "attribute vec2 texCoord3;\n";
 
     ss << "@VERTEX_FUNCTIONS@\n";
 
     if (params.color == GLShaderVariableVarying)
-        ss << "varying vec4 vColor;\n";
+	ss << "varying vec4 vColor;\n";
 
-    for (int i = 0; i < params.numTextures; i++)
-        ss << "varying vec2 vTexCoord" << i << ";\n";
+    for (int i = 0; i < params.numTextures; ++i)
+	ss << "varying vec2 vTexCoord" << i << ";\n";
 
     ss << "void main() {\n";
 
-    for (int i = 0; i < params.numTextures; i++)
-        ss << "vTexCoord" << i << " = texCoord" << i <<";\n";
+    for (int i = 0; i < params.numTextures; ++i)
+	ss << "vTexCoord" << i << " = texCoord" << i <<";\n";
 
     if (params.color == GLShaderVariableVarying)
-        ss << "vColor = color;\n";
+	ss << "vColor = color;\n";
 
     ss << "gl_Position = projection * modelview * vec4(position, 1.0);\n";
 
@@ -199,50 +203,52 @@
 {
     std::stringstream ss;
     ss << "#ifdef GL_ES\n" <<
-          "precision mediump float;\n" <<
-          "#endif\n";
+	  "precision mediump float;\n" <<
+	  "#endif\n";
 
     ss << "uniform vec3 paintAttrib;\n";
 
-    for (int i = 0; i < params.numTextures; i++) {
-        ss << "uniform sampler2D texture" << i << ";\n";
-        ss << "varying vec2 vTexCoord" << i << ";\n";
+    for (int i = 0; i < params.numTextures; ++i)
+    {
+	ss << "uniform sampler2D texture" << i << ";\n";
+	ss << "varying vec2 vTexCoord" << i << ";\n";
     }
 
     if (params.color == GLShaderVariableUniform)
-        ss << "uniform vec4 singleColor;\n";
+	ss << "uniform vec4 singleColor;\n";
     else if (params.color == GLShaderVariableVarying)
-        ss << "varying vec4 vColor;\n";
+	ss << "varying vec4 vColor;\n";
 
     ss << "@FRAGMENT_FUNCTIONS@\n";
 
     ss << "void main() {\n vec4 color = ";
 
     if (params.color == GLShaderVariableUniform)
-        ss << "singleColor *";
+	ss << "singleColor *";
     else if (params.color == GLShaderVariableVarying)
-        ss << "vColor *";
+	ss << "vColor *";
 
-    for (int i = 0; i < params.numTextures; i++)
-        ss << " texture2D(texture" << i << ", vTexCoord" << i << ") *";
+    for (int i = 0; i < params.numTextures; ++i)
+	ss << " texture2D(texture" << i << ", vTexCoord" << i << ") *";
 
     ss << " 1.0;\n";
 
-    if (params.saturation) {
+    if (params.saturation)
+    {
 	ss << "vec3 desaturated = color.rgb * vec3 (0.30, 0.59, 0.11);\n" <<
 	      "desaturated = vec3 (dot (desaturated, color.rgb));\n" <<
 	      "color.rgb = color.rgb * vec3 (paintAttrib.z) + desaturated *\n" <<
 	      "            vec3 (1.0 - paintAttrib.z);\n";
     }
 
-    if (params.brightness) {
+    if (params.brightness)
+    {
 	ss << "color.rgb = color.rgb * paintAttrib.y" <<
 	      (params.opacity ? " * paintAttrib.x;\n" : ";\n") <<
 	      (params.opacity ? "color.a = color.a * paintAttrib.x;\n" : "");
     }
-    else if (params.opacity) {
+    else if (params.opacity)
 	ss << "color = color * paintAttrib.x;\n";
-    }
 
     ss << "gl_FragColor = color;\n";
     ss << "@FRAGMENT_FUNCTION_CALLS@\n}";
 
=== modified file 'plugins/opengl/src/texture.cpp'
--- plugins/opengl/src/texture.cpp	2012-09-19 12:18:34 +0000
+++ plugins/opengl/src/texture.cpp	2013-07-24 16:05:45 +0000
@@ -48,7 +48,8 @@
 std::map<Damage, TfpTexture*> boundPixmapTex;
 #endif
 
-static GLTexture::Matrix _identity_matrix = {
+static GLTexture::Matrix _identity_matrix =
+{
     1.0f, 0.0f,
     0.0f, 1.0f,
     0.0f, 0.0f
@@ -62,14 +63,14 @@
 GLTexture::List::List (unsigned int size) :
     std::vector<GLTexture *> (size)
 {
-    for (unsigned int i = 0; i < size; i++)
+    for (unsigned int i = 0; i < size; ++i)
 	at (i) = NULL;
 }
 
 GLTexture::List::List (const GLTexture::List &c) :
     std::vector<GLTexture *> (c.size ())
 {
-    for (unsigned int i = 0; i < c.size (); i++)
+    for (unsigned int i = 0; i < c.size (); ++i)
     {
 	at (i) = c[i];
 	GLTexture::incRef (c[i]);
@@ -88,11 +89,13 @@
 {
     this->clear ();
     resize (c.size ());
-    for (unsigned int i = 0; i < c.size (); i++)
+
+    for (unsigned int i = 0; i < c.size (); ++i)
     {
 	at (i) = c[i];
 	GLTexture::incRef (c[i]);
     }
+
     return *this;
 }
 
@@ -102,6 +105,7 @@
     foreach (GLTexture *t, *this)
 	if (t)
 	    GLTexture::decRef (t);
+
     std::vector <GLTexture *>::clear ();
 }
 
@@ -119,15 +123,15 @@
 
 PrivateTexture::PrivateTexture (GLTexture *texture) :
     texture (texture),
-    name (0),
-    target (GL_TEXTURE_2D),
-    filter (GL_NEAREST),
-    wrap   (GL_CLAMP_TO_EDGE),
-    matrix (_identity_matrix),
-    mipmap  (true),
+    name          (0),
+    target        (GL_TEXTURE_2D),
+    filter        (GL_NEAREST),
+    wrap          (GL_CLAMP_TO_EDGE),
+    matrix        (_identity_matrix),
+    mipmap        (true),
     mipmapSupport (false),
-    initial (true),
-    refCount (1)
+    initial       (true),
+    refCount      (1)
 {
     glGenTextures (1, &name);
 }
@@ -135,9 +139,7 @@
 PrivateTexture::~PrivateTexture ()
 {
     if (name)
-    {
 	glDeleteTextures (1, &name);
-    }
 }
 
 GLuint
@@ -235,13 +237,11 @@
 	}
     }
 
-    if (priv->filter == GL_LINEAR_MIPMAP_LINEAR)
+    if (priv->filter == GL_LINEAR_MIPMAP_LINEAR &&
+	priv->initial)
     {
-	if (priv->initial)
-	{
-	    GL::generateMipmap (priv->target);
-	    priv->initial = false;
-	}
+	GL::generateMipmap (priv->target);
+	priv->initial = false;
     }
 }
 
@@ -255,10 +255,12 @@
 }
 
 void
-GLTexture::setData (GLenum target, Matrix &m, bool mipmap)
+GLTexture::setData (GLenum target,
+		    Matrix &m,
+		    bool   mipmap)
 {
-    priv->target = target;
-    priv->matrix = m;
+    priv->target        = target;
+    priv->matrix        = m;
     priv->mipmapSupport = mipmap;
 }
 
@@ -307,37 +309,36 @@
 
     GLTexture::List rv (1);
     GLTexture *t = new GLTexture ();
-    rv[0] = t;
+    rv[0]        = t;
 
     GLTexture::Matrix matrix = _identity_matrix;
-    GLint             internalFormat;
     GLenum            target;
     bool              mipmap;
     bool              pot = POWER_OF_TWO (width) && POWER_OF_TWO (height);
 
     #ifdef USE_GLES
-    target = GL_TEXTURE_2D;
+    target    = GL_TEXTURE_2D;
     matrix.xx = 1.0f / width;
     matrix.yy = 1.0f / height;
     matrix.y0 = 0.0f;
-    mipmap = GL::textureNonPowerOfTwoMipmap || pot;
+    mipmap    = GL::textureNonPowerOfTwoMipmap || pot;
     #else
 
     if (GL::textureNonPowerOfTwo || pot)
     {
-	target = GL_TEXTURE_2D;
+	target    = GL_TEXTURE_2D;
 	matrix.xx = 1.0f / width;
 	matrix.yy = 1.0f / height;
 	matrix.y0 = 0.0f;
-	mipmap = GL::generateMipmap && (GL::textureNonPowerOfTwoMipmap || pot);
+	mipmap    = GL::generateMipmap && (GL::textureNonPowerOfTwoMipmap || pot);
     }
     else
     {
-	target = GL_TEXTURE_RECTANGLE_NV;
+	target    = GL_TEXTURE_RECTANGLE_NV;
 	matrix.xx = 1.0f;
 	matrix.yy = 1.0f;
 	matrix.y0 = 0.0f;
-	mipmap = false;
+	mipmap    = false;
     }
     #endif
 
@@ -348,22 +349,21 @@
 
     #ifdef USE_GLES
     // For GLES2 no format conversion is allowed, i.e., format must equal internalFormat
-    internalFormat = format;
+    GLint internalFormat = format;
     #else
-    internalFormat = GL_RGBA;
+    GLint internalFormat = GL_RGBA;
     #endif
 
     #ifndef USE_GLES
-    CompOption *opt;
-    opt = GLScreen::get (screen)->getOption ("texture_compression");
+    CompOption *opt = GLScreen::get (screen)->getOption ("texture_compression");
+