Merge lp:~smspillaz/compiz/compiz.feature_1069112.cubeaddon into lp:compiz/0.9.9

[Sam Spilsbury]

Port cubeaddon plugin to use new OpenGL plugin API.
(LP: #1020823)

Since the arrangement of the vertex data assumes quad usage, and GL_QUADS primitives are not available in OpenGL|ES, the option "deform caps" will be nonfunctional in OpenGL|ES builds.

Port cubeaddon plugin to use new OpenGL plugin API.

Since the arrangement of the vertex data assumes quad usage, and GL_QUADS primitives are not available in OpenGL|ES, the option "deform caps" will be nonfunctional in OpenGL|ES builds.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/333//rebuild/?

review: Needs Fixing (continuous-integration)

[MC Return (mc-return)]

\o/

GREAT JOB! Compiles and works perfectly.

(Had to remove #set (COMPIZ_DISABLE_PLUGIN_CUBEADDON ON) from plugins/CMakeLists.txt completely though.)

Awesome to see long-time Compiz features come back !!!

review: Approve

[lp:~smspillaz/compiz/compiz.feature_1069112.cubeaddon]

3533. By Sam Spilsbury on 2012-12-26

Adjust buildsystem

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/334//rebuild/?

review: Needs Fixing (continuous-integration)

[lp:~smspillaz/compiz/compiz.feature_1069112.cubeaddon]

3534. By Sam Spilsbury on 2012-12-26

Install images too

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/335//rebuild/?

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

BUILD_GLES fails:
/home/dan/bzr/compiz/tmp.112/plugins/cubeaddon/src/cubeaddon.cpp: In member function ‘void CubeaddonScreen::CubeCap::load(bool, bool, bool)’:
/home/dan/bzr/compiz/tmp.112/plugins/cubeaddon/src/cubeaddon.cpp:114:9: error: ‘GL_CLAMP_TO_BORDER’ was not declared in this scope
make[2]: *** [plugins/cubeaddon/CMakeFiles/cubeaddon.dir/src/cubeaddon.cpp.o] Error 1
make[1]: *** [plugins/cubeaddon/CMakeFiles/cubeaddon.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....

----
Clang also fails:
In file included from /home/dan/bzr/compiz/tmp.112/plugins/cubeaddon/src/cubeaddon.cpp:26:
/home/dan/bzr/compiz/tmp.112/plugins/cubeaddon/src/cubeaddon.h:170:7: error:
      'CubeaddonWindow::glDraw' hides overloaded virtual function
      [-Werror,-Woverloaded-virtual]
        bool glDraw (const GLMatrix&, GLWindowPaintAttrib&,
             ^
/home/dan/bzr/compiz/tmp.112/plugins/cubeaddon/../opengl/include/opengl/opengl.h:849:15: note:
      hidden overloaded virtual function 'GLWindowInterface::glDraw' declared
      here
        virtual bool glDraw (const GLMatrix &matrix,
                     ^
In file included from /home/dan/bzr/compiz/tmp.112/plugins/cubeaddon/src/cubeaddon.cpp:26:
/home/dan/bzr/compiz/tmp.112/plugins/cubeaddon/src/cubeaddon.h:175:7: error:
      'CubeaddonWindow::glDrawTexture' hides overloaded virtual function
      [-Werror,-Woverloaded-virtual]
        void glDrawTexture (GLTexture *,
             ^
/home/dan/bzr/compiz/tmp.112/plugins/cubeaddon/../opengl/include/opengl/opengl.h:875:15: note:
      hidden overloaded virtual function 'GLWindowInterface::glDrawTexture'
      declared here
        virtual void glDrawTexture (GLTexture *texture, const GLMatrix &,
                     ^
2 errors generated.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Ah, thanks. I'll handle that now.

[Sam Spilsbury (smspillaz)]

(A note that we really really really really really really really need to have CI do BUILD_GLES and clang, the fact that reviewers are building code is silly)

[Sam Spilsbury (smspillaz)]

Fixed.

[lp:~smspillaz/compiz/compiz.feature_1069112.cubeaddon]

3535. By Sam Spilsbury on 2013-01-04

Merge compiz.fix_1095915

3536. By Sam Spilsbury on 2013-01-04

Fix build errors with clang / gles

[Daniel van Vugt (vanvugt)]

Not fixed. Latest revision on this branch is 26 December still :)

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Ah of course, branch aliases -.-

Really fixed.

[Daniel van Vugt (vanvugt)]

gcc 4.7.2 (quantal) BUILD_GLES:
/home/dan/bzr/compiz/tmp.112/plugins/opengl/src/screen.cpp: In member function ‘bool GLScreen::glInitContext(XVisualInfo*)’:
/home/dan/bzr/compiz/tmp.112/plugins/opengl/src/screen.cpp:547:24: error: invalid conversion from ‘void (*)(GLuint, GLsizei, const GLchar**, const GLint*) {aka void (*)(unsigned int, int, const char**, const int*)}’ to ‘GL::GLShaderSourceProc {aka void (*)(unsigned int, int, const char* const*, const int*)}’ [-fpermissive]

Seems to be the same change from:
https://code.launchpad.net/~compiz-team/compiz/compiz.fix_1095915/+merge/141851
so please add a prereq on that one.

review: Needs Resubmitting

[lp:~smspillaz/compiz/compiz.feature_1069112.cubeaddon]

3537. By Sam Spilsbury on 2013-01-04

Merge compiz.fix_1095915

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/342//rebuild/?

review: Approve (continuous-integration)

[lp:~smspillaz/compiz/compiz.feature_1069112.cubeaddon]

3538. By Sam Spilsbury on 2013-01-04

Use array instead of vector

3539. By Sam Spilsbury on 2013-01-05

Add cubeaddon to compiz-plugins.install.arm*

Unmerged revisions

=== modified file 'debian/compiz-plugins.install'
--- debian/compiz-plugins.install	2012-08-24 13:41:00 +0000
+++ debian/compiz-plugins.install	2013-01-04 07:52:23 +0000
@@ -6,6 +6,8 @@
 debian/tmp/usr/*/compiz/*copytex.*
 debian/tmp/usr/*/compiz/*crashhandler.*
 debian/tmp/usr/*/compiz/*cube.*
+debian/tmp/usr/*/compiz/*cubeaddon.*
+debian/tmp/usr/share/compiz/cubeaddon
 debian/tmp/usr/*/compiz/*dbus.*
 debian/tmp/usr/*/compiz/*extrawm.*
 debian/tmp/usr/*/compiz/*fadedesktop.*
 
=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2012-07-20 13:28:42 +0000
+++ plugins/CMakeLists.txt	2013-01-04 07:52:23 +0000
@@ -30,7 +30,6 @@
 set (COMPIZ_DISABLE_PLUGIN_BICUBIC ON)
 set (COMPIZ_DISABLE_PLUGIN_BLUR ON)
 set (COMPIZ_DISABLE_PLUGIN_COLORFILTER ON)
-set (COMPIZ_DISABLE_PLUGIN_CUBEADDON ON)
 set (COMPIZ_DISABLE_PLUGIN_GEARS ON)
 set (COMPIZ_DISABLE_PLUGIN_GROUP ON)
 set (COMPIZ_DISABLE_PLUGIN_LOGINOUT ON)
 
=== modified file 'plugins/cubeaddon/src/cubeaddon.cpp'
--- plugins/cubeaddon/src/cubeaddon.cpp	2012-11-18 00:26:33 +0000
+++ plugins/cubeaddon/src/cubeaddon.cpp	2013-01-04 07:52:23 +0000
@@ -27,15 +27,7 @@
 
 COMPIZ_PLUGIN_20090315 (cubeaddon, CubeaddonPluginVTable);
 
-const unsigned short CUBEADDON_GRID_SIZE = 100;
-const unsigned short CAP_ELEMENTS    = 15;
-const unsigned int   CAP_NVERTEX	    = (((CAP_ELEMENTS * (CAP_ELEMENTS + 1)) + 2) * 3);
-const unsigned int   CAP_NIDX	    = (CAP_ELEMENTS * (CAP_ELEMENTS - 1) * 4);
-
-const unsigned int   CAP_NIMGVERTEX  = (((CAP_ELEMENTS + 1) * (CAP_ELEMENTS + 1)) * 5);
-const unsigned int   CAP_NIMGIDX	    = (CAP_ELEMENTS * CAP_ELEMENTS * 4);
-
-const float RAD2I1024 = 162.9746617f;
+unsigned short COLORMAX = 0xffff;
 
 /*
  * Initiate a CubeCap
@@ -118,10 +110,13 @@
     {
 	if (GL::textureBorderClamp)
 	{
+#ifndef USE_GLES
+	    /* FIXME: Simulate with shaders */
 	    glTexParameteri (mTexture[0]->target (), GL_TEXTURE_WRAP_S,
 			     GL_CLAMP_TO_BORDER);
 	    glTexParameteri (mTexture[0]->target (), GL_TEXTURE_WRAP_T,
 			     GL_CLAMP_TO_BORDER);
+#endif
 	}
 	else
 	{
@@ -213,42 +208,62 @@
 {
     float i;
 
-    glPushMatrix ();
-
     glEnable (GL_BLEND);
     glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-    glLoadIdentity ();
-    glTranslatef (0.0, 0.0, -DEFAULT_Z_CAMERA);
-
     i = optionGetIntensity () * 2;
 
-    glBegin (GL_QUADS);
-    glColor4f (0.0, 0.0, 0.0, MAX (0.0, 1.0 - i) );
-    glVertex2f (0.5, 0.0);
-    glVertex2f (-0.5, 0.0);
-    glColor4f (0.0, 0.0, 0.0, MIN (1.0, 1.0 - (i - 1.0) ) );
-    glVertex2f (-0.5, -0.5);
-    glVertex2f (0.5, -0.5);
-    glEnd ();
+    GLMatrix transform;
+    transform.translate (0.0f, 0.0f, -DEFAULT_Z_CAMERA);
+
+    GLfloat ground1Vertices[] =
+    {
+	-0.5, -0.5, 0.0,
+	0.5, -0.5, 0.0,
+	-0.5, 0.0, 0.0,
+	0.5, 0.0, 0.0
+    };
+
+    unsigned short maxG1Color = MAX (0.0f, 1.0f - i) * 65535;
+    unsigned short minG1Color = MIN (1.0, 1.0 - (i - 1.0)) * 65535;
+
+    GLushort ground1Colors[] =
+    {
+	0, 0, 0, maxG1Color,
+	0, 0, 0, maxG1Color,
+	0, 0, 0, minG1Color,
+	0, 0, 0, minG1Color
+    };
+
+    GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
+    streamingBuffer->begin (GL_TRIANGLE_STRIP);
+
+    streamingBuffer->addVertices (4, ground1Vertices);
+    streamingBuffer->addColors (4, ground1Colors);
+    if (streamingBuffer->end ())
+	streamingBuffer->render (transform);
 
     if (optionGetGroundSize () > 0.0)
     {
-	glBegin (GL_QUADS);
-	glColor4usv (optionGetGroundColor1 () );
-	glVertex2f (-0.5, -0.5);
-	glVertex2f (0.5, -0.5);
-	glColor4usv (optionGetGroundColor2 () );
-	glVertex2f (0.5, -0.5 + optionGetGroundSize () );
-	glVertex2f (-0.5, -0.5 + optionGetGroundSize () );
-	glEnd ();
+	GLfloat ground2Vertices[] =
+	{
+	    -0.5, -0.5, 0.0,
+	    0.5, -0.5, 0.0,
+	    -0.5, static_cast <GLfloat> (-0.5 + optionGetGroundSize ()), 0.0,
+	    0.5, static_cast <GLfloat> (-0.5 + optionGetGroundSize ()), 0.0
+	};
+
+	streamingBuffer->begin (GL_TRIANGLE_STRIP);
+	streamingBuffer->addColors (1, optionGetGroundColor1 ());
+	streamingBuffer->addColors (1, optionGetGroundColor1 ());
+	streamingBuffer->addColors (1, optionGetGroundColor2 ());
+	streamingBuffer->addColors (1, optionGetGroundColor2 ());
+	streamingBuffer->addVertices (4, ground2Vertices);
+	if (streamingBuffer->end ())
+	    streamingBuffer->render (transform);
     }
 
-    glColor4usv (defaultColor);
-
     glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
     glDisable (GL_BLEND);
-    glPopMatrix ();
 }
 
 bool 
@@ -410,7 +425,6 @@
 
     opacity = cubeScreen->desktopOpacity () * color[3] / 0xffff;
 
-    glPushMatrix ();
     glEnable (GL_BLEND);
 
     if (top)
@@ -424,31 +438,29 @@
 	cAspect = optionGetBottomAspect ();
     }
 
-
-    glDisableClientState (GL_TEXTURE_COORD_ARRAY);
-
-    if (optionGetDeformation () == DeformationSphere &&
-        optionGetDeformCaps ())
-	glEnableClientState (GL_NORMAL_ARRAY);
-
-    glVertexPointer (3, GL_FLOAT, 0, mCapFill);
-
     glEnable(GL_CULL_FACE);
 
     for (l = 0; l < ((cubeScreen->invert () == 1) ? 2 : 1); l++)
     {
-	if (optionGetDeformation () == DeformationSphere &&
-	    optionGetDeformCaps ())
-	{
-	    glNormalPointer (GL_FLOAT, 0, (l == 0) ? mCapFill : mCapFillNorm);
-	}
-	else
-	    glNormal3f (0.0, (l == 0) ? 1.0 : -1.0, 0.0);
-
 	glCullFace(((l == 1) ^ top) ? cullInv : cullNorm);
 
 	for (i = 0; i < size; i++)
 	{
+	    GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
+
+	    streamingBuffer->begin (GL_TRIANGLE_FAN);
+
+	    if (optionGetDeformation () == DeformationSphere &&
+		optionGetDeformCaps ())
+	    {
+		streamingBuffer->addNormals (CAP_NVERTEX / 3, (l == 0) ? mCapFill : mCapFillNorm);
+	    }
+	    else
+	    {
+		GLfloat nonDeformNormals[] = { 0.0f, (l == 0) ? 1.0f : -1.0f, 0.0f };
+		streamingBuffer->addNormals (1, nonDeformNormals);
+	    }
+
 	    sa = sAttrib;
 	    sTransform = transform;
 	    if (cubeScreen->invert () == 1)
@@ -468,33 +480,77 @@
 
 	    gScreen->glApplyTransform (sa, output, &sTransform);
 
-	    glLoadMatrixf (sTransform.getMatrix ());
-	    glTranslatef (cubeScreen->outputXOffset (), -cubeScreen->outputYOffset (), 0.0f);
-	    glScalef (cubeScreen->outputXScale (), cubeScreen->outputYScale (), 1.0f);
-
-	    glScalef (1.0, cInv, 1.0);
-
-	    glColor4us (color[0] * opacity / 0xffff,
-		color[1] * opacity / 0xffff,
-		color[2] * opacity / 0xffff,
-		opacity);
-
-	    glDrawArrays (GL_TRIANGLE_FAN, 0, CAP_ELEMENTS + 2);
+	    GLMatrix cTransform (sTransform);
+	    cTransform.translate (cubeScreen->outputXOffset (), -cubeScreen->outputYOffset (), 0.0f);
+	    cTransform.scale (cubeScreen->outputXScale (), cubeScreen->outputYScale (), 1.0f);
+	    cTransform.scale (1.0, cInv, 1.0);
+
+	    float normalizedOpacity = opacity / static_cast <float> (OPAQUE);
+	    float premultColors[] =
+	    {
+		(color[0] / OPAQUE) * normalizedOpacity,
+		(color[1] / OPAQUE) * normalizedOpacity,
+		(color[2] / OPAQUE) * normalizedOpacity
+	    };
+
+	    streamingBuffer->color4f (premultColors[0],
+				      premultColors[1],
+				      premultColors[2],
+				      normalizedOpacity);
+
+	    streamingBuffer->addVertices (CAP_ELEMENTS + 2, mCapFill);
+	    if (streamingBuffer->end ())
+		streamingBuffer->render (cTransform);
+
 	    if (optionGetDeformation () == DeformationSphere &&
 	        optionGetDeformCaps ())
-		glDrawElements (GL_QUADS, CAP_NIDX, GL_UNSIGNED_SHORT,
-				mCapFillIdx);
+	    {
+#ifndef USE_GLES
+		streamingBuffer->begin (GL_QUADS);
+		streamingBuffer->color4f (premultColors[0],
+					  premultColors[1],
+					  premultColors[2],
+					  normalizedOpacity);
+		streamingBuffer->addNormals (CAP_NVERTEX / 3, (l == 0) ? mCapFill : mCapFillNorm);
+
+		GLushort *idx = mCapFillIdx;
+		std::vector <GLfloat> capVertices;
+
+		capVertices.reserve (CAP_NIDX * 3);
+
+		for (unsigned int i = 0; i < CAP_NIDX; ++i)
+		{
+		    unsigned int   vertexIndex = idx[i] * 3;
+
+		    capVertices.push_back (mCapFill[vertexIndex]);
+		    capVertices.push_back (mCapFill[vertexIndex + 1]);
+		    capVertices.push_back (mCapFill[vertexIndex + 2]);
+		}
+
+		streamingBuffer->addVertices (CAP_NIDX, &capVertices[0]);
+
+		if (streamingBuffer->end ())
+		    streamingBuffer->render (cTransform);
+#endif
+	    }
 
 	    if (cap->mLoaded)
 	    {
-		float    s_gen[4], t_gen[4];
+		GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
 		GLMatrix texMat = cap->mTexMat;
 
 		if (cubeScreen->invert () != 1)
 		    texMat.scale (-1.0, 1.0, 1.0);
 
-		glColor4us (cubeScreen->desktopOpacity (), cubeScreen->desktopOpacity (),
-			    cubeScreen->desktopOpacity (), cubeScreen->desktopOpacity ());
+		streamingBuffer->begin (GL_TRIANGLE_FAN);
+
+		float normalizedOpacity = cubeScreen->desktopOpacity () / OPAQUE;
+
+		streamingBuffer->color4f (normalizedOpacity,
+					  normalizedOpacity,
+					  normalizedOpacity,
+					  normalizedOpacity);
+
 	        cap->mTexture[0]->enable (GLTexture::Good);
 
 		if (cAspect)
@@ -525,61 +581,124 @@
 		
 		texMat.rotate (-(360.0f / size) * i, 0.0, 0.0, 1.0);
 
-		s_gen[0] = texMat[0];
-		s_gen[1] = texMat[8];
-		s_gen[2] = texMat[4];
-		s_gen[3] = texMat[12];
-		t_gen[0] = texMat[1];
-		t_gen[1] = texMat[9];
-		t_gen[2] = texMat[5];
-		t_gen[3] = texMat[13];
-
-		glTexGenfv(GL_T, GL_OBJECT_PLANE, t_gen);
-		glTexGenfv(GL_S, GL_OBJECT_PLANE, s_gen);
-
-		glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
-		glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
-
-		glEnable(GL_TEXTURE_GEN_S);
-		glEnable(GL_TEXTURE_GEN_T);
-
-		glDrawArrays (GL_TRIANGLE_FAN, 0, CAP_ELEMENTS + 2);
+		GLVector sGen (texMat[0], texMat[8], texMat[4], texMat[12]);
+		GLVector tGen (texMat[1], texMat[9], texMat[5], texMat[13]);
+
+		std::vector <GLfloat> texCoords;
+
+		/* Generate texCoords for the top section of the
+		 * cap */
+		texCoords.reserve ((CAP_ELEMENTS + 2) * 2);
+
+		for (unsigned int i = 0; i < CAP_ELEMENTS + 2; i++)
+		{
+		    GLVector v (mCapFill[i * 3],
+				mCapFill[i * 3 + 1],
+				mCapFill[i * 3 + 2],
+				1.0f);
+		    float s = v * sGen;
+		    float t = v * tGen;
+
+		    texCoords.push_back (s);
+		    texCoords.push_back (t);
+		}
+
+		streamingBuffer->addTexCoords (0, CAP_NVERTEX / 3, &texCoords[0]);
+		streamingBuffer->addVertices (CAP_NVERTEX / 3, mCapFill);
+		streamingBuffer->setMaxVertices (CAP_ELEMENTS + 2);
+		if (streamingBuffer->end ())
+		    streamingBuffer->render (cTransform);
+
 		if (optionGetDeformation () == DeformationSphere &&
 	            optionGetDeformCaps ())
-		    glDrawElements (GL_QUADS, CAP_NIDX, GL_UNSIGNED_SHORT,
-				    mCapFillIdx);
-
-		glDisable(GL_TEXTURE_GEN_S);
-		glDisable(GL_TEXTURE_GEN_T);
+		{
+#ifndef USE_GLES
+		    streamingBuffer->begin (GL_QUADS);
+		    streamingBuffer->color4f (normalizedOpacity,
+					      normalizedOpacity,
+					      normalizedOpacity,
+					      normalizedOpacity);
+		    streamingBuffer->addNormals (CAP_NVERTEX / 3, (l == 0) ? mCapFill : mCapFillNorm);
+
+		    /* Generate texCoords and vertices for the
+		     * curvature around the top section of the cap
+		     *
+		     * This is a little more inefficient than it should be.
+		     *
+		     * The previous implementation used glDrawElements with
+		     * and IBO to ensure that we didn't send lots of redundant
+		     * geometry to the GPU, however GLVertexBuffer doesn't have
+		     * any concept of indexed rendering, and instead takes a vertex
+		     * buffer with all the geometry.
+		     *
+		     * FIXME: This code uses GL_QUADS, so its not compatible with
+		     * OpenGL|ES at the moment
+		     */
+		    GLushort *idx = mCapFillIdx;
+		    std::vector <GLfloat> capVertices;
+
+		    /* Clear old texCoords buffer */
+		    texCoords.clear ();
+
+		    /* Reserve enough space */
+		    capVertices.reserve (CAP_NIDX * 3);
+		    texCoords.reserve (CAP_NIDX * 2);
+
+		    for (unsigned int i = 0; i < CAP_NIDX; ++i)
+		    {
+			unsigned int   vertexIndex = idx[i] * 3;
+
+			GLVector v (mCapFill[vertexIndex],
+				    mCapFill[vertexIndex + 1],
+				    mCapFill[vertexIndex + 2],
+				    1.0f);
+
+			capVertices.push_back (v[GLVector::x]);
+			capVertices.push_back (v[GLVector::y]);
+			capVertices.push_back (v[GLVector::z]);
+
+			/* GL_OBJECT_LINEAR is simulated by doing:
+			 * texCoord.s = dot (vec4 (obj, 1.0), sGenPlane)
+			 * texCoord.t = dot (vec4 (obj, 1.0), tGenPlane)
+			 */
+			float s = v * sGen;
+			float t = v * tGen;
+
+			texCoords.push_back (s);
+			texCoords.push_back (t);
+		    }
+
+		    streamingBuffer->addVertices (CAP_NIDX, &capVertices[0]);
+		    streamingBuffer->addTexCoords (0, CAP_NIDX, &texCoords[0]);
+
+		    if (streamingBuffer->end ())
+			streamingBuffer->render (cTransform);
+#endif
+		}
+
 		cap->mTexture[0]->disable ();
 	    }
 	}
     }
 
-    glEnableClientState (GL_TEXTURE_COORD_ARRAY);
-    glDisableClientState (GL_NORMAL_ARRAY);
     glDisable (GL_BLEND);
-    glNormal3f (0.0, -1.0, 0.0);
 
     glCullFace (cullNorm);
     if (!wasCulled)
 	glDisable (GL_CULL_FACE);
-
-    glPopMatrix ();
-
-    glColor4usv (defaultColor);
 }
 
 void 
 CubeaddonScreen::cubePaintTop (const GLScreenPaintAttrib &sAttrib,
 			       const GLMatrix            &transform,
 			       CompOutput                *output,
-			       int                       size)
+			       int                       size,
+			       const GLVector            &normal)
 {
     if ((!optionGetDrawBottom () && cubeScreen->invert () == -1) ||
         (!optionGetDrawTop () && cubeScreen->invert () == 1))
     {
-	cubeScreen->cubePaintTop (sAttrib, transform, output, size);
+	cubeScreen->cubePaintTop (sAttrib, transform, output, size, normal);
     }
 
     if (!optionGetDrawTop ())
@@ -593,12 +712,13 @@
 CubeaddonScreen::cubePaintBottom (const GLScreenPaintAttrib &sAttrib,
 				  const GLMatrix            &transform,
 				  CompOutput                *output,
-				  int                       size)
+				  int                       size,
+				  const GLVector            &normal)
 {
     if ((!optionGetDrawBottom () && cubeScreen->invert () == 1) ||
         (!optionGetDrawTop () && cubeScreen->invert () == -1))
     {
-	cubeScreen->cubePaintBottom (sAttrib, transform, output, size);
+	cubeScreen->cubePaintBottom (sAttrib, transform, output, size, normal);
     }
 
     if (!optionGetDrawBottom ())
@@ -617,8 +737,8 @@
 {
     if (caScreen->mDeform > 0.0)
     {
-	GLWindow::Geometry &geometry = gWindow->geometry ();
-	int                i, oldVCount = geometry.vCount;
+	GLVertexBuffer     *vb = gWindow->vertexBuffer ();
+	int                i, oldVCount = vb->countVertices ();
 	GLfloat            *v;
 	int                offX = 0, offY = 0;
 	int                sx1, sx2, sw, sy1, sy2, sh;
@@ -645,10 +765,12 @@
 	gWindow->glAddGeometry (matrix, region, clip, 
 				MIN (CUBEADDON_GRID_SIZE, maxGridWidth),
 				maxGridHeight);
+
+	vb = gWindow->vertexBuffer ();
 	
-	v  = geometry.vertices;
-	v += geometry.vertexStride - 3;
-	v += geometry.vertexStride * oldVCount;
+	v  = vb->getVertices ();
+	v += vb->getVertexStride () - 3;
+	v += vb->getVertexStride () * oldVCount;
 
 	if (!window->onAllViewports ())
 	{
@@ -707,7 +829,7 @@
 	{
 	    float lastX = std::numeric_limits <float>::min (), lastZ = 0.0;
 	
-	    for (i = oldVCount; i < geometry.vCount; i++)
+	    for (i = oldVCount; i < vb->countVertices (); i++)
 	    {
 		if (v[0] == lastX)
 		{
@@ -728,7 +850,7 @@
 		lastX = v[0];
 		lastZ = v[2];
 
-		v += geometry.vertexStride;
+		v += vb->getVertexStride ();
 	    }
 	}
 	else
@@ -738,20 +860,20 @@
 	    last[1][0] = -1000000000.0;
 
 	    int cLast = 0;
-	    for (i = oldVCount; i < geometry.vCount; i++)
+	    for (i = oldVCount; i < vb->countVertices (); i++)
 	    {
 		if (last[0][0] == v[0] && last[0][1] == v[1])
 		{
 		    v[0] = last[0][2];
 		    v[2] = last[0][3];
-		    v += geometry.vertexStride;
+		    v += vb->getVertexStride ();
 		    continue;
 		}
 		else if (last[1][0] == v[0] && last[1][1] == v[1])
 		{
 		    v[0] = last[1][2];
 		    v[2] = last[1][3];
-		    v += geometry.vertexStride;
+		    v += vb->getVertexStride ();
 		    continue;
 		}
 		
@@ -777,7 +899,7 @@
 		    last[cLast][3] = v[2];
 		    cLast = (cLast + 1) & 1;
 		}
-		v += geometry.vertexStride;
+		v += vb->getVertexStride ();
 	    }
 	}
     }
@@ -788,10 +910,10 @@
 }
 
 bool 
-CubeaddonWindow::glDraw (const GLMatrix     &transform,
-			 GLFragment::Attrib &attrib,
-			 const CompRegion   &region,
-			 unsigned int       mask)
+CubeaddonWindow::glDraw (const GLMatrix            &transform,
+			 const GLWindowPaintAttrib &attrib,
+			 const CompRegion          &region,
+			 unsigned int              mask)
 {
     if (!(mask & PAINT_WINDOW_TRANSFORMED_MASK) && caScreen->mDeform)
     {
@@ -816,9 +938,10 @@
 }
 
 void 
-CubeaddonWindow::glDrawTexture (GLTexture           *texture,
-				GLFragment::Attrib& attrib,
-				unsigned int        mask)
+CubeaddonWindow::glDrawTexture (GLTexture                 *texture,
+				const GLMatrix            &matrix,
+				const GLWindowPaintAttrib &attrib,
+				unsigned int              mask)
 {
     if (caScreen->mDeform > 0.0 && caScreen->gScreen->lighting ())
     {
@@ -829,18 +952,20 @@
 	GLfloat   *v, *n;
 	float     inv;
 	
-	GLWindow::Geometry           &geometry = gWindow->geometry ();
+	GLVertexBuffer               *vb = gWindow->vertexBuffer ();
 	CubeScreen::MultioutputMode  cMOM = cubeScreen->multioutputMode ();
 	float                        cDist = cubeScreen->distance ();
 
 	inv = (cubeScreen->invert () == 1) ? 1.0: -1.0;
 	ym  = (caScreen->optionGetDeformation () == CubeaddonScreen::DeformationCylinder) ? 0.0 : 1.0;
 	
-	if ((int) caScreen->mWinNormSize < geometry.vCount * 3)
+	int vertexCount = vb->countVertices ();
+
+	if ((int) caScreen->mWinNormSize < vertexCount * 3)
 	{
 	    delete [] caScreen->mWinNormals;
-	    caScreen->mWinNormals = new GLfloat[geometry.vCount * 3];
-	    caScreen->mWinNormSize = geometry.vCount * 3;
+	    caScreen->mWinNormals = new GLfloat[vertexCount * 3];
+	    caScreen->mWinNormSize = vertexCount * 3;
 	}
 	
 	if (!window->onAllViewports ())
@@ -891,12 +1016,12 @@
 	    }
 	}
 	
-	v = geometry.vertices + (geometry.vertexStride - 3);
+	v = vb->getVertices () + (vb->getVertexStride () - 3);
 	n = caScreen->mWinNormals;
 
 	if (cubeScreen->paintOrder () == FTB)
 	{
-	    for (i = 0; i < geometry.vCount; i++)
+	    for (i = 0; i < vertexCount; i++)
 	    {
 		x = (((v[0] + offX - sx1) / (float)sw) - 0.5);
 		y = (((v[1] + offY - sy1) / (float)sh) - 0.5);
@@ -905,12 +1030,12 @@
 		*(n)++ = y / sh * caScreen->mDeform * ym;
 		*(n)++ = v[2] + cDist;
 
-		v += geometry.vertexStride;
+		v += vb->getVertexStride ();
 	    }
 	}
 	else
 	{
-	    for (i = 0; i < geometry.vCount; i++)
+	    for (i = 0; i < vertexCount; i++)
 	    {
 		x = (((v[0] + offX - sx1) / (float)sw) - 0.5);
 		y = (((v[1] + offY - sy1) / (float)sh) - 0.5);
@@ -919,24 +1044,18 @@
 		*(n)++ = -y / sh * caScreen->mDeform * ym * inv;
 		*(n)++ = -(v[2] + cDist);
     
-		v += geometry.vertexStride;
+		v += vb->getVertexStride ();
 	    }
 	}
-	
-	glEnable (GL_NORMALIZE);
-	glNormalPointer (GL_FLOAT,0, caScreen->mWinNormals);
-	
-	glEnableClientState (GL_NORMAL_ARRAY);
-	
-	gWindow->glDrawTexture (texture, attrib, mask);
-
-	glDisable (GL_NORMALIZE);
-	glDisableClientState (GL_NORMAL_ARRAY);
-	glNormal3f (0.0, 0.0, -1.0);
+
+	vb->addNormals (caScreen->mWinNormSize / 3,
+			caScreen->mWinNormals);
+
+	gWindow->glDrawTexture (texture, matrix, attrib, mask);
 	return;
     }
 
-    gWindow->glDrawTexture (texture, attrib, mask);
+    gWindow->glDrawTexture (texture, matrix, attrib, mask);
 }
 
 bool
@@ -956,7 +1075,6 @@
 					   CompOutput                *output,
 					   unsigned int              mask)
 {
-    static GLfloat light0Position[] = { -0.5f, 0.5f, -9.0f, 1.0f };
     GLMatrix       sTransform = transform;
     float          cDist = cubeScreen->distance ();
     float          cDist2 = cubeScreen->distance () * cubeScreen->distance ();
@@ -1257,82 +1375,97 @@
 		rTransform.scale (1.0, -1.0, 1.0);
 	    }
 
-	    glPushMatrix ();
-	    glLoadIdentity ();
-	    glScalef (1.0, -1.0, 1.0);
-	    glLightfv (GL_LIGHT0, GL_POSITION, light0Position);
-	    glPopMatrix ();
 	    glCullFace (GL_FRONT);
 
 	    gScreen->glPaintTransformedOutput (sAttrib, rTransform,
 					       region, output, mask);
 
 	    glCullFace (GL_BACK);
-	    glPushMatrix ();
-	    glLoadIdentity ();
-	    glLightfv (GL_LIGHT0, GL_POSITION, light0Position);
-	    glPopMatrix ();
 
 	    if (optionGetMode () == ModeAbove && mVRot > 0.0)
 	    {
 		int   j;
 		float i, c;
 		float v = MIN (1.0, mVRot / 30.0);
-		float col1[4], col2[4];
-
-		glPushMatrix ();
+		unsigned short col1[4], col2[4];
+
+		GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
+
+		GLMatrix gTransform;
 
 		glEnable (GL_BLEND);
 		glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-		glLoadIdentity ();
-		glTranslatef (0.0, 0.0, -DEFAULT_Z_CAMERA);
+		gTransform.translate (0, 0, -DEFAULT_Z_CAMERA);
 
 		i = optionGetIntensity () * 2;
 		c = optionGetIntensity ();
 
-		glBegin (GL_QUADS);
-		glColor4f (0.0, 0.0, 0.0,
-			   ((1 - v) * MAX (0.0, 1.0 - i)) + (v * c));
-		glVertex2f (0.5, v / 2.0);
-		glVertex2f (-0.5, v / 2.0);
-		glColor4f (0.0, 0.0, 0.0,
-			   ((1 - v) * MIN (1.0, 1.0 - (i - 1.0))) + (v * c));
-		glVertex2f (-0.5, -0.5);
-		glVertex2f (0.5, -0.5);
-		glEnd ();
+		GLfloat vertices[] =
+		{
+		    0.5f, v / 2.0f, 0.0f,
+		    -0.5f, v / 2.0f, 0.0f,
+		    -0.5f, -0.5f, 0.0f,
+		    0.5f, -0.5f, 0.0f
+		};
+
+		unsigned short cMax = MAX (0.0, 1.0 - i) + (v * c);
+		unsigned short cMin = MIN (1.0, 1.0 - (i - 1.0)) + (v * c);
+
+		GLushort colors[] =
+		{
+		    0, 0, 0, cMax,
+		    0, 0, 0, cMax,
+		    0, 0, 0, cMin,
+		    0, 0, 0, cMin
+		};
+
+		streamingBuffer->begin (GL_TRIANGLE_STRIP);
+		streamingBuffer->addColors (4, colors);
+		streamingBuffer->addVertices (4, vertices);
+		if (streamingBuffer->end ())
+		    streamingBuffer->render (gTransform);
 
 		for (j = 0; j < 4; j++)
 		{
 		    col1[j] = (1.0 - v) * optionGetGroundColor1 () [j] +
 			      (v * (optionGetGroundColor1 () [j] +
 				    optionGetGroundColor2 () [j]) * 0.5);
-		    col1[j] /= 0xffff;
 		    col2[j] = (1.0 - v) * optionGetGroundColor2 () [j] +
 			      (v * (optionGetGroundColor1 () [j] +
 				    optionGetGroundColor2 () [j]) * 0.5);
-		    col2[j] /= 0xffff;
 		}
 
 		if (optionGetGroundSize () > 0.0)
 		{
-		    glBegin (GL_QUADS);
-		    glColor4fv (col1);
-		    glVertex2f (-0.5, -0.5);
-		    glVertex2f (0.5, -0.5);
-		    glColor4fv (col2);
-		    glVertex2f (0.5, -0.5 +
-				((1 - v) * optionGetGroundSize ()) + v);
-		    glVertex2f (-0.5, -0.5 +
-				((1 - v) * optionGetGroundSize ()) + v);
-		    glEnd ();
+		    GLfloat vertices[] =
+		    {
+			-0.5f, -0.5f, 0.0f,
+			0.5f, -0.5f, 0.0f,
+			0.5f, -0.5f +
+			static_cast <GLfloat> (((1 - v) * optionGetGroundSize ()) + v),
+			-0.5f, -0.5f +
+			static_cast <GLfloat> (((1 - v) * optionGetGroundSize ()) + v)
+		    };
+
+		    GLushort colors[] =
+		    {
+			col1[0], col1[1], col1[2], col1[3],
+			col1[0], col1[1], col1[2], col1[3],
+			col2[0], col2[1], col2[2], col2[3],
+			col2[0], col2[1], col2[2], col2[3]
+		    };
+
+		    streamingBuffer->begin (GL_TRIANGLE_STRIP);
+		    streamingBuffer->addVertices (4, vertices);
+		    streamingBuffer->addColors (4, colors);
+
+		    if (streamingBuffer->end ())
+			streamingBuffer->render (gTransform);
 		}
 
-		glColor4usv (defaultColor);
-
 		glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 		glDisable (GL_BLEND);
-		glPopMatrix ();
 	    }
 	    else
 		drawBasicGround ();
 
=== modified file 'plugins/cubeaddon/src/cubeaddon.h'
--- plugins/cubeaddon/src/cubeaddon.h	2012-09-07 22:37:20 +0000
+++ plugins/cubeaddon/src/cubeaddon.h	2013-01-04 07:52:23 +0000
@@ -39,15 +39,15 @@
 
 #include "cubeaddon_options.h"
 
-extern const unsigned short CUBEADDON_GRID_SIZE;
-extern const unsigned short CAP_ELEMENTS;
-extern const unsigned int   CAP_NVERTEX;
-extern const unsigned int   CAP_NIDX;
-
-extern const unsigned int   CAP_NIMGVERTEX;
-extern const unsigned int   CAP_NIMGIDX;
-
-extern const float RAD2I1024 = 162.9746617f;
+const unsigned short CUBEADDON_GRID_SIZE = 100;
+const unsigned short CAP_ELEMENTS    = 15;
+const unsigned int   CAP_NVERTEX	    = (((CAP_ELEMENTS * (CAP_ELEMENTS + 1)) + 2) * 3);
+const unsigned int   CAP_NIDX	    = (CAP_ELEMENTS * (CAP_ELEMENTS - 1) * 4);
+
+const unsigned int   CAP_NIMGVERTEX  = (((CAP_ELEMENTS + 1) * (CAP_ELEMENTS + 1)) * 5);
+const unsigned int   CAP_NIMGIDX	    = (CAP_ELEMENTS * CAP_ELEMENTS * 4);
+
+const float RAD2I1024 = 162.9746617f;
 
 class CubeaddonScreen :
     public CompositeScreenInterface,
@@ -76,11 +76,13 @@
 	void cubePaintTop (const GLScreenPaintAttrib &sAttrib,
 			   const GLMatrix            &transform,
 			   CompOutput                *output,
-			   int                       size);
+			   int                       size,
+			   const GLVector            &normal);
 	void cubePaintBottom (const GLScreenPaintAttrib &sAttrib,
 			      const GLMatrix            &transform,
 			      CompOutput                *output,
-			      int                       size);
+			      int                       size,
+			      const GLVector            &normal);
 	bool cubeCheckOrientation (const GLScreenPaintAttrib &sAttrib,
 				   const GLMatrix            &transform,
 				   CompOutput                *output,
@@ -165,12 +167,14 @@
     public:
 	CubeaddonWindow (CompWindow *);
 
-	bool glDraw (const GLMatrix&, GLFragment::Attrib&,
+	bool glDraw (const GLMatrix&, const GLWindowPaintAttrib&,
 		     const CompRegion&, unsigned int);
 	void glAddGeometry (const GLTexture::MatrixList&,
 			    const CompRegion&, const CompRegion&,
 			    unsigned int, unsigned int);
-	void glDrawTexture (GLTexture *, GLFragment::Attrib& attrib,
+	void glDrawTexture (GLTexture *,
+			    const GLMatrix &matrix,
+			    const GLWindowPaintAttrib& attrib,
 			    unsigned int);
 
 	CompWindow      *window;
 
=== modified file 'plugins/opengl/src/screen.cpp'
--- plugins/opengl/src/screen.cpp	2013-01-01 09:41:41 +0000
+++ plugins/opengl/src/screen.cpp	2013-01-04 07:52:23 +0000
@@ -544,7 +544,7 @@
     GL::getProgramiv = glGetProgramiv;
     GL::getProgramInfoLog = glGetProgramInfoLog;
     GL::createShader = glCreateShader;
-    GL::shaderSource = glShaderSource;
+    GL::shaderSource = (GL::GLShaderSourceProc) glShaderSource;
     GL::compileShader = glCompileShader;
     GL::createProgram = glCreateProgram;
     GL::attachShader = glAttachShader;