X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fsystem_information_dialog.cc;h=addb89da4c7ab7d64882905b830b1f6651a23312;hb=96107588e0ddf383d21ff00b4d3febb313e43794;hp=2630833656a0ee128de2a84f4a90d636a6ee9fee;hpb=73bed50f5aa5bc32b09d1bae3c082b0b944ba669;p=dcpomatic.git diff --git a/src/wx/system_information_dialog.cc b/src/wx/system_information_dialog.cc index 263083365..addb89da4 100644 --- a/src/wx/system_information_dialog.cc +++ b/src/wx/system_information_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2019-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,9 +18,13 @@ */ + +#include "film_viewer.h" +#include "gl_video_view.h" #include "system_information_dialog.h" #include "wx_util.h" + #ifdef DCPOMATIC_OSX #include #include @@ -29,18 +33,58 @@ #include #endif + using std::string; +using std::weak_ptr; +using std::shared_ptr; -SystemInformationDialog::SystemInformationDialog (wxWindow* parent) + +#if wxCHECK_VERSION(3, 1, 0) + +SystemInformationDialog::SystemInformationDialog (wxWindow* parent, weak_ptr weak_viewer) : TableDialog (parent, _("System information"), 2, 1, false) { - add (_("OpenGL version"), true); - char const * v = (char const *) glGetString (GL_VERSION); - if (v) { - add (std_to_wx(v), false); - } else { + auto viewer = weak_viewer.lock (); + shared_ptr gl; + if (viewer) { + gl = std::dynamic_pointer_cast(viewer->video_view()); + } + + if (!gl) { + add (_("OpenGL version"), true); add (_("unknown (OpenGL not enabled in DCP-o-matic)"), false); + } else { + + auto information = gl->information(); + auto add_string = [this, &information](GLenum name, wxString label) { + add (label, true); + auto i = information.find(name); + if (i != information.end()) { + add (std_to_wx(i->second), false); + } else { + add (_("unknown"), false); + } + }; + + add_string (GL_VENDOR, _("Vendor")); + add_string (GL_RENDERER, _("Renderer")); + add_string (GL_VERSION, _("Version")); + add_string (GL_SHADING_LANGUAGE_VERSION, _("Shading language version")); + + add (_("vsync"), true); + add (gl->vsync_enabled() ? _("enabled") : _("not enabled"), false); } layout (); } + +#else + +SystemInformationDialog::SystemInformationDialog (wxWindow* parent, weak_ptr) + : TableDialog (parent, _("System information"), 2, 1, false) +{ + add (_("OpenGL version"), true); + add (_("OpenGL renderer not supported by this DCP-o-matic version"), false); +} + +#endif