Merge lp:~unity-team/nux/nux.fix-glsl-major-detection into lp:nux/2.0

[Jay Taoko]

* Fixed detection of OpenGL major and minor version numbers.

* Fixed detection of OpenGL major and minor version numbers.
UNBLOCK

[lp:~unity-team/nux/nux.fix-glsl-major-detection]

611. By Jay Taoko on 2012-04-09

* Code cleanup.

612. By Jay Taoko on 2012-04-10

* Fix

613. By Jay Taoko on 2012-04-10

* Another fix

614. By Jay Taoko on 2012-04-10

* Fix

615. By Jay Taoko on 2012-04-10

* Cleanup.

[Didier Roche-Tolomelli (didrocks)]

the string manipulation looks ok to me, approving then and I confirm it's now detected as OpenGL > 2 here and so I can get the gsls shader path and not the ARB ones. Thanks Jay!

review: Approve

=== modified file 'NuxGraphics/GpuDevice.cpp'
--- NuxGraphics/GpuDevice.cpp	2011-11-16 05:11:46 +0000
+++ NuxGraphics/GpuDevice.cpp	2012-04-10 21:17:18 +0000
@@ -327,8 +327,22 @@
 #endif
 
 #ifndef NUX_OPENGLES_20
-    CHECKGL(glGetIntegerv(GL_MAJOR_VERSION, &_opengl_major));
-    CHECKGL(glGetIntegerv(GL_MINOR_VERSION, &_opengl_minor));
+    _glsl_version_string = ANSI_TO_TCHAR(NUX_REINTERPRET_CAST(const char *, glGetString(GL_VERSION)));
+    CHECKGL_MSG(glGetString(GL_VERSION));
+
+    NString opengl_major;
+    NString opengl_minor;
+    char split = '.';
+    _glsl_version_string.SplitAtFirstOccurenceOf(split, opengl_major, opengl_minor);
+
+    _opengl_major = (char)opengl_major.GetTCharPtr()[0] - '0';
+    _opengl_minor = (char)opengl_minor.GetTCharPtr()[0] - '0';
+
+    if (_opengl_major >= 3)
+    {
+      CHECKGL(glGetIntegerv(GL_MAJOR_VERSION, &_opengl_major));
+      CHECKGL(glGetIntegerv(GL_MINOR_VERSION, &_opengl_minor));
+    }
 #else
     _opengl_major = 2;
     _opengl_minor = 0;
@@ -512,40 +526,14 @@
     CHECKGL_MSG(glGetString(GL_RENDERER));
     _openGL_version_string = ANSI_TO_TCHAR(NUX_REINTERPRET_CAST(const char *, glGetString(GL_VERSION)));
     CHECKGL_MSG(glGetString(GL_VERSION));
-#ifndef NUX_OPENGLES_20
-    if (GLEW_VERSION_2_0)
-#else
-    if (1)
-#endif
-    {
-      _glsl_version_string = ANSI_TO_TCHAR(NUX_REINTERPRET_CAST(const char *, glGetString(GL_SHADING_LANGUAGE_VERSION)));
-      CHECKGL_MSG(glGetString(GL_SHADING_LANGUAGE_VERSION));
-
-      NString glsl_major;
-      NString glsl_minor;
-      char split = '.';
-      _glsl_version_string.SplitAtFirstOccurenceOf(split, glsl_major, glsl_minor);
-
-    }
 
     nuxDebugMsg("Gpu Vendor: %s", _board_vendor_string.GetTCharPtr());
     nuxDebugMsg("Gpu Renderer: %s", _board_renderer_string.GetTCharPtr());
     nuxDebugMsg("Gpu OpenGL Version: %s", _openGL_version_string.GetTCharPtr());
+    nuxDebugMsg("Gpu OpenGL Major Version: %d", _opengl_major);
+    nuxDebugMsg("Gpu OpenGL Minor Version: %d", _opengl_minor);
     nuxDebugMsg("Gpu GLSL Version: %s", _glsl_version_string.GetTCharPtr());
 
-#ifndef NUX_OPENGLES_20
-    // Get the version supported by the context that was set.
-    int new_opengl_major;
-    int new_opengl_minor;
-    CHECKGL(glGetIntegerv(GL_MAJOR_VERSION, &new_opengl_major));
-    CHECKGL(glGetIntegerv(GL_MINOR_VERSION, &new_opengl_minor));
-
-    if ((new_opengl_major != _opengl_major) || (new_opengl_minor != _opengl_minor))
-    {
-      nuxDebugMsg("The Gpu supports OpenGL %d.%d but version %d.%d has been requested.", _opengl_major, _opengl_minor, new_opengl_major, new_opengl_minor);
-    }
-#endif
-
     NString TempStr = (const char *) TCharToUpperCase(_board_vendor_string.GetTCharPtr());
 
     if (TempStr.FindFirstOccurence("NVIDIA") != tstring::npos)

=== modified file 'NuxGraphics/GraphicsEngine.cpp'
--- NuxGraphics/GraphicsEngine.cpp	2012-02-09 05:39:28 +0000
+++ NuxGraphics/GraphicsEngine.cpp	2012-04-10 21:17:18 +0000
@@ -166,6 +166,16 @@
     // Evaluate the features provided by the GPU.
     EvaluateGpuCaps();
 
+    if (UsingGLSLCodePath())
+    {
+      nuxDebugMsg("The GraphicsEngine is using the GLSL shader code path.");
+    }
+    else
+    {
+      nuxDebugMsg("The GraphicsEngine is using the assenbly shader code path."); 
+    }
+
+
     GlWindow.m_GraphicsContext = this;
     ResetStats();