Fix opengl in msvc

MRPT · Mar 14, 2020 · 858862d · 858862d
1 parent 48e913c
commit 858862d
Show file tree

Hide file tree

Showing 12 changed files with 44,256 additions and 16,156 deletions.
diff --git a/3rdparty/glew/include/GL/eglew.h b/3rdparty/glew/include/GL/eglew.h
diff --git a/3rdparty/glew/include/GL/glew.h b/3rdparty/glew/include/GL/glew.h
diff --git a/3rdparty/glew/include/GL/glxew.h b/3rdparty/glew/include/GL/glxew.h
diff --git a/3rdparty/glew/include/GL/wglew.h b/3rdparty/glew/include/GL/wglew.h
diff --git a/3rdparty/glew/src/glew.c b/3rdparty/glew/src/glew.c
diff --git a/libs/gui/CMakeLists.txt b/libs/gui/CMakeLists.txt
@@ -49,4 +49,8 @@ if(BUILD_mrpt-gui)
 		target_link_libraries(gui PRIVATE ${MRPT_OPENGL_LIBS})
 	endif()
 
+	if (TARGET mrpt_glew) # Basically, for Windows
+		target_link_libraries(gui PRIVATE mrpt_glew)
+	endif()
+
 endif()
diff --git a/libs/gui/src/CDisplayWindow3D.cpp b/libs/gui/src/CDisplayWindow3D.cpp
@@ -397,10 +397,14 @@ CDisplayWindow3D::Ptr CDisplayWindow3D::Create(
 CDisplayWindow3D::~CDisplayWindow3D()
 {
 	// get lock so we make sure nobody else is touching the window right now.
-	m_csAccess3DScene.try_lock_for(std::chrono::seconds(2));
+	bool lock_ok = m_csAccess3DScene.try_lock_for(std::chrono::seconds(2));
 	m_csAccess3DScene.unlock();
 
 	CBaseGUIWindow::destroyWxWindow();
+
+	if (!lock_ok)
+		std::cerr
+			<< "[~CDisplayWindow3D] Warning: Timeout acquiring mutex lock.\n";
 }
 
 /*---------------------------------------------------------------

diff --git a/libs/opengl/src/COpenGLBuffer.cpp b/libs/opengl/src/COpenGLBuffer.cpp
@@ -42,8 +42,15 @@ void COpenGLBuffer::RAII_Impl::destroy()
 {
 	if (!created) return;
 #if MRPT_HAS_OPENGL_GLUT
-	release();
-	glDeleteBuffers(1, &buffer_id);
+	try
+	{
+		release();
+		glDeleteBuffers(1, &buffer_id);
+	}
+	catch (...)
+	{
+		// For Windows: ignore errors if GLEW was already unloaded...
+	}
 #endif
 	buffer_id = 0;
 	created = false;
@@ -61,7 +68,14 @@ void COpenGLBuffer::RAII_Impl::release()
 {
 #if MRPT_HAS_OPENGL_GLUT
 	if (!created) return;
-	glBindBuffer(static_cast<GLenum>(type), 0);
+	try
+	{
+		glBindBuffer(static_cast<GLenum>(type), 0);
+	}
+	catch (...)
+	{
+		// For Windows: ignore errors if GLEW was already unloaded...
+	}
 #endif
 }
 

diff --git a/libs/opengl/src/COpenGLVertexArrayObject.cpp b/libs/opengl/src/COpenGLVertexArrayObject.cpp
@@ -7,12 +7,13 @@
    | Released under BSD License. See: https://www.mrpt.org/License          |
    +------------------------------------------------------------------------+ */
 
-#include "opengl-precomp.h"  // Precompiled header
+#include "opengl-precomp.h"	 // Precompiled header
 
 #include <mrpt/core/exceptions.h>
 #include <mrpt/opengl/COpenGLVertexArrayObject.h>
 #include <mrpt/opengl/opengl_api.h>
 
+
 using namespace mrpt::opengl;
 
 COpenGLVertexArrayObject::COpenGLVertexArrayObject()
@@ -41,8 +42,15 @@ void COpenGLVertexArrayObject::RAII_Impl::destroy()
 {
 	if (!created) return;
 #if MRPT_HAS_OPENGL_GLUT
-	release();
-	glDeleteVertexArrays(1, &buffer_id);
+	try
+	{
+		release();
+		glDeleteVertexArrays(1, &buffer_id);
+	}
+	catch (...)
+	{
+		// For Windows: ignore errors if GLEW was already unloaded...
+	}
 #endif
 	buffer_id = 0;
 	created = false;
@@ -59,7 +67,14 @@ void COpenGLVertexArrayObject::RAII_Impl::bind()
 void COpenGLVertexArrayObject::RAII_Impl::release()
 {
 #if MRPT_HAS_OPENGL_GLUT
-	if (!created) return;
-	glBindVertexArray(0);
+	try
+	{
+		if (!created) return;
+		glBindVertexArray(0);
+	}
+	catch (...)
+	{
+		// For Windows: ignore errors if GLEW was already unloaded...
+	}
 #endif
 }
diff --git a/libs/opengl/src/COpenGLViewport.cpp b/libs/opengl/src/COpenGLViewport.cpp
@@ -22,6 +22,7 @@
 
 #include <mrpt/opengl/opengl_api.h>
 
+
 using namespace mrpt;
 using namespace mrpt::poses;
 using namespace mrpt::opengl;
@@ -164,7 +165,7 @@ void COpenGLViewport::renderImageMode() const
 
 	// Prepare raster pos & pixel copy direction in -Y.
 	glRasterPos2f(-0.5f, -0.5f);
-	glPixelZoom(vw / float(ortho_w), -vh / float(ortho_h));
+	glPixelZoom(vw / float(ortho_w), vh / float(-ortho_h));
 
 	// Prepare image data types:
 	const GLenum img_type = GL_UNSIGNED_BYTE;

diff --git a/libs/opengl/src/CRenderizableShaderTexturedTriangles.cpp b/libs/opengl/src/CRenderizableShaderTexturedTriangles.cpp
@@ -0,0 +1,10 @@
+/* +------------------------------------------------------------------------+
+   |                     Mobile Robot Programming Toolkit (MRPT)            |
+   |                          https://www.mrpt.org/                         |
+   |                                                                        |
+   | Copyright (c) 2005-2019, Individual contributors, see AUTHORS file     |
+   | See: https://www.mrpt.org/Authors - All rights reserved.               |
+   | Released under BSD License. See: https://www.mrpt.org/License          |
+   +------------------------------------------------------------------------+ */
+
+#include "opengl-precomp.h"	 // Precompiled header
diff --git a/libs/opengl/src/DefaultShaders.cpp b/libs/opengl/src/DefaultShaders.cpp
@@ -96,6 +96,11 @@ Program::Ptr mrpt::opengl::LoadDefaultShader(const shader_id_t id)
 				"Unknown shader_id_t=%u", static_cast<unsigned>(id));
 	};
 
+	// Init GLEW if not already done: 
+#ifdef _WIN32
+	glewInit();
+#endif
+
 	auto shader = std::make_shared<Program>();
 
 	std::string errMsgs;