3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-18 12:17:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ENABLE_SHADERS_MANAGER set as default

Browse source
This commit is contained in:
enricoturri1966 2020-05-22 16:08:02 +02:00
parent 4d05ec0856
commit 314995fa0b
18 changed files with 57 additions and 1198 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/OpenGLManager.hpp
View file

@ -1,9 +1,7 @@
#ifndef slic3r_OpenGLManager_hpp_
#define slic3r_OpenGLManager_hpp_
#if ENABLE_SHADERS_MANAGER
#include "GLShadersManager.hpp"
#endif // ENABLE_SHADERS_MANAGER
class wxWindow;
class wxGLCanvas;
@ -75,9 +73,7 @@ private:
bool m_gl_initialized{ false };
wxGLContext* m_context{ nullptr };
#if ENABLE_SHADERS_MANAGER
GLShadersManager m_shaders_manager;
#endif // ENABLE_SHADERS_MANAGER
static GLInfo s_gl_info;
#if ENABLE_HACK_CLOSING_ON_OSX_10_9_5
#ifdef __APPLE__
@ -96,10 +92,8 @@ public:
bool init_gl();
wxGLContext* init_glcontext(wxGLCanvas& canvas);
#if ENABLE_SHADERS_MANAGER
GLShaderProgram* get_shader(const std::string& shader_name) { return m_shaders_manager.get_shader(shader_name); }
GLShaderProgram* get_current_shader() { return m_shaders_manager.get_current_shader(); }
#endif // ENABLE_SHADERS_MANAGER
static bool are_compressed_textures_supported() { return s_compressed_textures_supported; }
static bool can_multisample() { return s_multisample == EMultisampleState::Enabled; }