[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58586] branches/soc-2013-viewport_fx/ intern/ghost/intern/GHOST_WindowWin32.cpp: Added eglBindAPI calls in a future case where OpenGL VG or desktop OpenGL contexts are also being initialized by EGL .

[Jason Wilkins]

Revision: 58586
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58586
Author:   jwilkins
Date:     2013-07-24 22:48:05 +0000 (Wed, 24 Jul 2013)
Log Message:
-----------
Added eglBindAPI calls in a future case where OpenGL VG or desktop OpenGL contexts are also being initialized by EGL.

Modified Paths:
--------------
    branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_WindowWin32.cpp

Modified: branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-07-24 21:56:06 UTC (rev 58585)
+++ branches/soc-2013-viewport_fx/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-07-24 22:48:05 UTC (rev 58586)
@@ -420,6 +420,9 @@
 	::wglMakeCurrent(NULL, NULL);
 #elif defined(WITH_GL_SYSTEM_EMBEDDED)
 	if (m_egl_display != EGL_NO_DISPLAY) {
+#if defined(WITH_GL_PROFILE_ES20)
+		eglBindAPI(EGL_OPENGL_ES_API);
+#endif
 		::eglMakeCurrent(
 			m_egl_display,
 			EGL_NO_SURFACE,
@@ -725,6 +728,10 @@
 			m_egl_surface != EGL_NO_SURFACE &&
 			m_egl_context != EGL_NO_CONTEXT)
 		{
+#if defined(WITH_GL_PROFILE_ES20)
+			eglBindAPI(EGL_OPENGL_ES_API);
+#endif
+
 			success =
 				::eglMakeCurrent(
 					m_egl_display,
@@ -1014,6 +1021,10 @@
 			if (!::eglInitialize(m_egl_display, &major, &minor))
 				break;
 
+#if defined(WITH_GL_PROFILE_ES20)
+			eglBindAPI(EGL_OPENGL_ES_API);
+#endif
+
 			printf("EGL v%d.%d\n", major, minor);
 
 			std::vector<EGLint> attrib_list(20);
@@ -1094,6 +1105,11 @@
 			success = GHOST_kFailure;
 	}
 
+#if defined(WITH_GL_SYSTEM_EMBEDDED)
+	if (success = GHOST_kFailure) {
+	}
+#endif
+
 	return success;
 }