Enforce GLSL 1.4 on Mesa systems

src/rviz/ogre_helpers/render_system.cpp

@@ -171,18 +171,19 @@ void RenderSystem::loadOgrePlugins()
 
 void RenderSystem::detectGlVersion()
 {
+  bool mesa_workaround = false;
   if (force_gl_version_)
   {
     gl_version_ = force_gl_version_;
   }
   else
   {
     Ogre::RenderSystem* renderSys = ogre_root_->getRenderSystem();
-    renderSys->createRenderSystemCapabilities();
-    const Ogre::RenderSystemCapabilities* caps = renderSys->getCapabilities();
+    const Ogre::RenderSystemCapabilities* caps = renderSys->createRenderSystemCapabilities();
     int major = caps->getDriverVersion().major;
     int minor = caps->getDriverVersion().minor;
     gl_version_ = major * 100 + minor * 10;
+    mesa_workaround = caps->getDeviceName().find("Mesa ") != std::string::npos && gl_version_ >= 320;
   }
 
   switch (gl_version_)
@@ -213,8 +214,16 @@ void RenderSystem::detectGlVersion()
     }
     break;
   }
-  ROS_INFO_STREAM("OpenGl version: " << (float)gl_version_ / 100.0 << " (GLSL "
-                                     << (float)glsl_version_ / 100.0 << ").");
+  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);
 }
 
 void RenderSystem::setupRenderSystem()

src/rviz/properties/combo_box.cpp

@@ -27,12 +27,17 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "rviz/properties/combo_box.h"
+#include <rviz/properties/combo_box.h>
+#include <QAbstractItemView>
 
 namespace rviz
 {
-ComboBox::ComboBox(QWidget* parent) : QComboBox(parent)
+// allow popup list to become larger than QCombBox itself
+void ComboBox::showPopup()
 {
+  auto view = this->view();
+  view->setMinimumWidth(view->sizeHintForColumn(0));
+  QComboBox::showPopup();
 }
 
 } // end namespace rviz

src/rviz/properties/combo_box.h

@@ -38,7 +38,8 @@ class ComboBox : public QComboBox
   Q_OBJECT
   Q_PROPERTY(QString currentText READ currentText USER true)
 public:
-  ComboBox(QWidget* parent = nullptr);
+  using QComboBox::QComboBox;
+  void showPopup() override;
 };
 
 } // end namespace rviz

src/rviz/properties/editable_enum_property.cpp

@@ -61,6 +61,8 @@ QWidget* EditableEnumProperty::createEditor(QWidget* parent, const QStyleOptionV
   Q_EMIT requestOptions(this);
 
   EditableComboBox* cb = new EditableComboBox(parent);
+  // avoid larger comboxbox than column width of PropertyWidget
+  cb->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon);
   cb->addItems(strings_);
   cb->setEditText(getValue().toString());
   QObject::connect(cb, SIGNAL(currentIndexChanged(const QString&)), this,

src/rviz/properties/splitter_handle.cpp

@@ -50,7 +50,8 @@ SplitterHandle::SplitterHandle(QTreeView* parent)
 bool SplitterHandle::eventFilter(QObject* event_target, QEvent* event)
 {
   if (event_target == parent_ &&
-      (event->type() == QEvent::Resize || event->type() == QEvent::LayoutRequest))
+      (event->type() == QEvent::Resize || event->type() == QEvent::LayoutRequest ||
+       event->type() == QEvent::Show))
   {
     updateGeometry();
   }