diff --git a/src/rviz/ogre_helpers/render_system.cpp b/src/rviz/ogre_helpers/render_system.cpp index 92ea55346f..1d47615799 100644 --- a/src/rviz/ogre_helpers/render_system.cpp +++ b/src/rviz/ogre_helpers/render_system.cpp @@ -171,7 +171,6 @@ void RenderSystem::loadOgrePlugins() void RenderSystem::detectGlVersion() { - bool mesa_workaround = false; if (force_gl_version_) { gl_version_ = force_gl_version_; @@ -184,10 +183,6 @@ void RenderSystem::detectGlVersion() int major = caps->getDriverVersion().major; int minor = caps->getDriverVersion().minor; gl_version_ = major * 100 + minor * 10; - - std::string gl_version_string = (const char*)glGetString(GL_VERSION); - // The "Mesa 2" string is intended to match "Mesa 20.", "Mesa 21." and so on - mesa_workaround = gl_version_string.find("Mesa 2") != std::string::npos && gl_version_ >= 320; } switch (gl_version_) @@ -218,15 +213,6 @@ void RenderSystem::detectGlVersion() } break; } - if (mesa_workaround) - { // https://github.com/ros-visualization/rviz/issues/1508 - ROS_INFO("OpenGl version: %.1f (GLSL %.1f) limited to GLSL 1.4 on Mesa system.", - (float)gl_version_ / 100.0, (float)glsl_version_ / 100.0); - - gl_version_ = 310; - glsl_version_ = 140; - return; - } ROS_INFO("OpenGl version: %.1f (GLSL %.1f).", (float)gl_version_ / 100.0, (float)glsl_version_ / 100.0); }