Merge lp:~smspillaz/unity/unity.fix_1041123 into lp:unity

[Sam Spilsbury]

Don't enable client states if BUILD_MODERN_COMPIZ_GL

Don't enable client states if BUILD_MODERN_COMPIZ_GL

[Olivier Tilloy (osomon)]

I can confirm that this fixes the crash I’m observing when running unity trunk on precise with NVidia proprietary drivers.

I’m not familiar enough with the code to be able to tell whether this could introduce regressions though, so this would need to be tested on different HW configurations.

review: Approve

[Daniel van Vugt (vanvugt)]

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-08-21 10:33:07 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-08-24 10:22:22 +0000
@@ -496,6 +496,7 @@
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
 
+#ifndef USE_MODERN_COMPIZ_GL
   /* This is needed to Fix a crash in glDrawArrays with the NVIDIA driver
    * see bugs #1031554 and #982626.
    * The NVIDIA driver looks to see if the legacy GL_VERTEX_ARRAY,
@@ -505,6 +506,7 @@
   glDisableClientState(GL_VERTEX_ARRAY);
   glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 #endif
+#endif
 
   glGetError();
 }
@@ -536,10 +538,12 @@
 
   glPopAttrib();
 
+#ifndef USE_MODERN_COMPIZ_GL
   /* Re-enable the client states that have been disabled in nuxPrologue, for
    * NVIDIA compatibility reasons */
   glEnableClientState(GL_VERTEX_ARRAY);
   glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+#endif
 #else
 #ifdef USE_GLES
   glDepthRangef(0, 1);