Merge lp:~vanvugt/nux/fix-1068009 into lp:nux

[Daniel van Vugt]

Fix GLES build failure. (LP: #1067081)

[Timo Jyrinki (timo-jyrinki)]

Armel built now successfully (https://launchpad.net/~unity-team/+archive/ppa/+build/3912300), approving.

review: Approve

=== modified file 'NuxGraphics/IOpenGLAsmShader.cpp'
--- NuxGraphics/IOpenGLAsmShader.cpp	2012-10-10 22:46:50 +0000
+++ NuxGraphics/IOpenGLAsmShader.cpp	2012-10-18 07:50:24 +0000
@@ -104,12 +104,20 @@
   }
 
   IOpenGLAsmVertexShader::IOpenGLAsmVertexShader()
+#ifndef NUX_OPENGLES_20
     : IOpenGLAsmShader("VertexProgram", GL_VERTEX_PROGRAM_ARB, RT_GLSL_VERTEXSHADER)
+#else
+    : IOpenGLAsmShader("VertexProgram", 0, RT_GLSL_VERTEXSHADER)
+#endif
   {
   }
 
   IOpenGLAsmPixelShader::IOpenGLAsmPixelShader()
+#ifndef NUX_OPENGLES_20
     : IOpenGLAsmShader("PixelProgram", GL_FRAGMENT_PROGRAM_ARB, RT_GLSL_PIXELSHADER)
+#else
+    : IOpenGLAsmShader("PixelProgram", 0, RT_GLSL_PIXELSHADER)
+#endif
   {
   }