=== modified file 'plugins/opengl/include/opengl/opengl.h'
--- plugins/opengl/include/opengl/opengl.h	2011-02-24 07:52:09 +0000
+++ plugins/opengl/include/opengl/opengl.h	2011-07-17 09:58:11 +0000
@@ -398,6 +398,7 @@
 	WRAPABLE_HND (4, GLScreenInterface, void, glDisableOutputClipping);
 
 	friend class GLTexture;
+	friend class TfpTexture;
 
     private:
 	PrivateGLScreen *priv;

=== modified file 'plugins/opengl/opengl.xml.in'
--- plugins/opengl/opengl.xml.in	2010-02-03 03:24:09 +0000
+++ plugins/opengl/opengl.xml.in	2011-07-17 13:05:33 +0000
@@ -9,6 +9,16 @@
 	    </requirement>
 	</deps>
 	<options>
+	    <option name="force_no_tfp" type="bool">
+		<_short>Force no texture from pixmap</_short>
+		<_long>Don't use this unless you have another texture binder enabled!</_long>
+		<default>true</default>
+	    </option>
+	    <option name="force_rectangle_textures" type="bool">
+		<_short>Force rectangle textures</_short>
+		<_long>Force rectangle textures</_long>
+		<default>false</default>
+	    </option>
 	    <option name="texture_filter" type="int">
 		<_short>Texture Filter</_short>
 		<_long>Texture filtering</_long>

=== modified file 'plugins/opengl/src/texture.cpp'
--- plugins/opengl/src/texture.cpp	2011-02-24 07:52:09 +0000
+++ plugins/opengl/src/texture.cpp	2011-07-17 13:06:20 +0000
@@ -450,8 +450,10 @@
 				 int    height,
 				 int    depth)
 {
+    GLenum error;
+
     if ((int) width > GL::maxTextureSize || (int) height > GL::maxTextureSize ||
-        !GL::textureFromPixmap)
+	!GL::textureFromPixmap && !GLScreen::get (screen)->priv->optionGetForceNoTfp ())
 	return GLTexture::List ();
 
     GLTexture::List   rv (1);
@@ -484,7 +486,7 @@
        is not supported, then allow the server to choose the texture target. */
     if (config->textureTargets & GLX_TEXTURE_2D_BIT_EXT &&
        (GL::textureNonPowerOfTwo ||
-       (POWER_OF_TWO (width) && POWER_OF_TWO (height))))
+       (POWER_OF_TWO (width) && POWER_OF_TWO (height))) && !GLScreen::get (screen)->priv->optionGetForceRectangleTextures ())
 	target = GLX_TEXTURE_2D_EXT;
     else if (config->textureTargets & GLX_TEXTURE_RECTANGLE_BIT_EXT)
 	target = GLX_TEXTURE_RECTANGLE_EXT;
@@ -493,6 +495,7 @@
        that don't advertise any texture target in the fbconfig. */
     if (!target)
     {
+	fprintf (stderr, "WARNING: TFP IMPLEMENTATION IS BROKEN! No texture targets specified in fbconfig!\n");
 	if (!(config->textureTargets & GLX_TEXTURE_2D_BIT_EXT))
 	    target = GLX_TEXTURE_RECTANGLE_EXT;
 	else if (!(config->textureTargets & GLX_TEXTURE_RECTANGLE_BIT_EXT))
@@ -507,9 +510,23 @@
 
     attribs[i++] = None;
 
+    error = glGetError ();
+
+    if (error)
+    {
+	fprintf (stderr, "Error: %i\n", error);
+    }
+
     glxPixmap = (*GL::createPixmap) (screen->dpy (), config->fbConfig,
 				     pixmap, attribs);
 
+    error = glGetError ();
+
+    if (error)
+    {
+	fprintf (stderr, "GLXPixmap: Error: %i\n", error);
+    }
+
     if (!glxPixmap)
     {
 	compLogMessage ("core", CompLogLevelWarn,
@@ -522,22 +539,50 @@
 	(*GL::queryDrawable) (screen->dpy (), glxPixmap,
 			      GLX_TEXTURE_TARGET_EXT, &target);
 
+    error = glGetError ();
+
+    if (error)
+    {
+	fprintf (stderr, "GLXQueryDrawable: Error: %i\n", error);
+    }
+
+
     switch (target) {
 	case GLX_TEXTURE_2D_EXT:
-	    texTarget = GL_TEXTURE_2D;
+	    if (GLScreen::get (screen)->priv->optionGetForceRectangleTextures ())
+	    {
+		texTarget = GL_TEXTURE_RECTANGLE_ARB;
 
-	    matrix.xx = 1.0f / width;
-	    if (config->yInverted)
-	    {
-		matrix.yy = 1.0f / height;
-		matrix.y0 = 0.0f;
+		matrix.xx = 1.0f;
+		if (config->yInverted)
+		{
+		    matrix.yy = 1.0f;
+		    matrix.y0 = 0;
+		}
+		else
+		{
+		    matrix.yy = -1.0f;
+		    matrix.y0 = height;
+		}
+		mipmap = false;
 	    }
 	    else
 	    {
-		matrix.yy = -1.0f / height;
-		matrix.y0 = 1.0f;
+		texTarget = GL_TEXTURE_2D;
+
+		matrix.xx = 1.0f / width;
+		if (config->yInverted)
+		{
+		    matrix.yy = 1.0f / height;
+		    matrix.y0 = 0.0f;
+		}
+		else
+		{
+		    matrix.yy = -1.0f / height;
+		    matrix.y0 = 1.0f;
+		}
+		mipmap = config->mipmap;
 	    }
-	    mipmap = config->mipmap;
 	    break;
 	case GLX_TEXTURE_RECTANGLE_EXT:
 	    texTarget = GL_TEXTURE_RECTANGLE_ARB;
@@ -575,9 +620,24 @@
 
     glBindTexture (texTarget, tex->name ());
 
+    error = glGetError ();
+
+    if (error)
+    {
+	fprintf (stderr, "GLBindTexture: Error: %i\n", error);
+    }
+
 
     (*GL::bindTexImage) (screen->dpy (), glxPixmap, GLX_FRONT_LEFT_EXT, NULL);
 
+    error = glGetError ();
+
+    if (error)
+    {
+	fprintf (stderr, "GLXBindTexImageEXT: Error: %i\n", error);
+    }
+
+
     tex->setFilter (GL_NEAREST);
     tex->setWrap (GL_CLAMP_TO_EDGE);