FIX: #156 - Equalizer crash due to wrong glew initialization

Author: febret

include/omega/GpuResource.h

@@ -94,11 +94,12 @@ namespace omega
 			TextureUnit2 = GL_TEXTURE2,
 			TextureUnit3 = GL_TEXTURE3 };
 
-		GpuContext();
+		GpuContext(bool initializeGlew = true);
 		~GpuContext();
 
 		uint getId() { return myId; }
-		//GLEWContext* getGlewContext() { return myGlewContext; }
+		GLEWContext* getGlewContext() { return myGlewContext; }
+        void makeCurrent();
         //void setGlewContext(GLEWContext* ctx) { myGlewContext = ctx; }
 
 	private:

src/displaySystems/Equalizer/PipeImpl.cpp

@@ -47,6 +47,7 @@ PipeImpl::~PipeImpl()
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 bool PipeImpl::configInit(const uint128_t& initID)
 {
-	myGpuContext = new GpuContext();
+    // false = do not initialize GLEW in GpuContext. Equalizer takes care of Glew initialization.
+	myGpuContext = new GpuContext(false);
 	return Pipe::configInit(initID);
 }

src/displaySystems/Equalizer/WindowImpl.cpp

@@ -87,6 +87,7 @@ bool WindowImpl::configInit(const uint128_t& initID)
     sInitLock.lock();
     bool res = Window::configInit(initID);
     sInitLock.unlock();
+    oflog(Debug, "[WindowImpl::configInit] <%1%> done", %initID);
     return res;
 }
 
@@ -207,7 +208,9 @@ void WindowImpl::frameStart(const uint128_t& frameID, const uint32_t frameNumber
     // NOTE: getting the glew context from the first window is correct since all
     // windows attached to the same pape share the same Glew (and OpenGL) contexts.
     // NOTE2: do NOT remove these two lines. rendering explodes if you do.
-    const GLEWContext* glewc = this->glewGetContext();
+    const GLEWContext* glewc = myRenderer->getGpuContext()->getGlewContext();
+    myRenderer->getGpuContext()->makeCurrent();
+    oassert(glewc != NULL);
     //myRenderer->getGpuContext()->setGlewContext(glewc);
     glewSetContext(glewc);
 }

src/omega/GpuResource.cpp

@@ -1,53 +1,64 @@
-/**************************************************************************************************
- * THE OMEGA LIB PROJECT
- *-------------------------------------------------------------------------------------------------
- * Copyright 2010-2015		Electronic Visualization Laboratory, University of Illinois at Chicago
- * Authors:										
- *  Alessandro Febretti		[email protected]
- *-------------------------------------------------------------------------------------------------
- * Copyright (c) 2010-2015, Electronic Visualization Laboratory, University of Illinois at Chicago
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without modification, are permitted 
- * provided that the following conditions are met:
- * 
- * Redistributions of source code must retain the above copyright notice, this list of conditions 
- * and the following disclaimer. Redistributions in binary form must reproduce the above copyright 
- * notice, this list of conditions and the following disclaimer in the documentation and/or other 
- * materials provided with the distribution. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR 
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE  GOODS OR SERVICES; LOSS OF 
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *************************************************************************************************/
-#include "omega/GpuResource.h"
-#include "omega/glheaders.h"
-using namespace omega;
-
-uint GpuContext::mysNumContexts = 0;
-Lock GpuContext::mysContextLock = Lock();
-
-///////////////////////////////////////////////////////////////////////////////
-GpuContext::GpuContext()
-{
-	mysContextLock.lock();
-	myId = mysNumContexts++;
-
-	// Initialize Glew
-	myGlewContext = new GLEWContext();
-    glewSetContext(myGlewContext);
-    glewInit();
-
-	mysContextLock.unlock();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-GpuContext::~GpuContext()
-{
-    delete myGlewContext;
-    myGlewContext = NULL;
-}
+/**************************************************************************************************
+ * THE OMEGA LIB PROJECT
+ *-------------------------------------------------------------------------------------------------
+ * Copyright 2010-2015		Electronic Visualization Laboratory, University of Illinois at Chicago
+ * Authors:										
+ *  Alessandro Febretti		[email protected]
+ *-------------------------------------------------------------------------------------------------
+ * Copyright (c) 2010-2015, Electronic Visualization Laboratory, University of Illinois at Chicago
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without modification, are permitted 
+ * provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this list of conditions 
+ * and the following disclaimer. Redistributions in binary form must reproduce the above copyright 
+ * notice, this list of conditions and the following disclaimer in the documentation and/or other 
+ * materials provided with the distribution. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR 
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE  GOODS OR SERVICES; LOSS OF 
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *************************************************************************************************/
+#include "omega/GpuResource.h"
+#include "omega/glheaders.h"
+using namespace omega;
+
+uint GpuContext::mysNumContexts = 0;
+Lock GpuContext::mysContextLock = Lock();
+
+///////////////////////////////////////////////////////////////////////////////
+GpuContext::GpuContext(bool initializeGlew)
+{
+	mysContextLock.lock();
+	myId = mysNumContexts++;
+
+	// Initialize Glew
+	myGlewContext = new GLEWContext();
+    glewSetContext(myGlewContext);
+    if(initializeGlew)
+    {
+        oflog(Debug, "[GpuContext::GpuContext] <%1%> Glew init", %myId);
+        glewInit();
+    }
+
+	mysContextLock.unlock();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+void GpuContext::makeCurrent()
+{
+    oassert(myGlewContext != NULL);
+    glewSetContext(myGlewContext);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+GpuContext::~GpuContext()
+{
+    delete myGlewContext;
+    myGlewContext = NULL;
+}