diff options
author | Vojtech Kral <vojtech@kral.hk> | 2018-11-27 14:10:21 +0300 |
---|---|---|
committer | Vojtech Kral <vojtech@kral.hk> | 2018-11-27 18:57:37 +0300 |
commit | 21cb489077893c568914ea8a2e1ebdeded86847f (patch) | |
tree | fa90d87d9ef822cdbeb12fa136d7ad5d3b270af6 /src/slic3r/GUI/ImGuiWrapper.hpp | |
parent | f203f6fbd977e6901852187fd000ef5bb748d02c (diff) |
WIP: imgui: Fix GLSL version enumeration
Diffstat (limited to 'src/slic3r/GUI/ImGuiWrapper.hpp')
-rw-r--r-- | src/slic3r/GUI/ImGuiWrapper.hpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/slic3r/GUI/ImGuiWrapper.hpp b/src/slic3r/GUI/ImGuiWrapper.hpp index 4e20af9fd..5c1bffc88 100644 --- a/src/slic3r/GUI/ImGuiWrapper.hpp +++ b/src/slic3r/GUI/ImGuiWrapper.hpp @@ -18,11 +18,12 @@ namespace GUI { class ImGuiWrapper { std::string m_glsl_version_string; - unsigned int m_shader_handle; - unsigned int m_vert_handle; - unsigned int m_frag_handle; - unsigned int m_vbo_handle; - unsigned int m_elements_handle; + unsigned m_glsl_version; + unsigned m_shader_handle; + unsigned m_vert_handle; + unsigned m_frag_handle; + unsigned m_vbo_handle; + unsigned m_elements_handle; int m_attrib_location_tex; int m_attrib_location_proj_mtx; int m_attrib_location_position; @@ -32,7 +33,7 @@ class ImGuiWrapper typedef std::map<std::string, ImFont*> FontsMap; FontsMap m_fonts; - unsigned int m_font_texture; + unsigned m_font_texture; unsigned m_mouse_buttons; @@ -41,6 +42,7 @@ public: ~ImGuiWrapper(); bool init(); + void read_glsl_version(); void set_display_size(float w, float h); bool update_mouse_data(wxMouseEvent &evt); |