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

ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION set as default

Browse source
This commit is contained in:
Enrico Turri 2019-06-24 09:27:19 +02:00
parent 96276394d1
commit 301eda7369
6 changed files with 0 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/slic3r/GUI/GLCanvas3DManager.hpp
View file

@ -29,7 +29,6 @@ struct Camera;
class GLCanvas3DManager
{
#if ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
public:
class GLInfo
{
@ -61,26 +60,8 @@ public:
private:
void detect() const;
};
#else
struct GLInfo
{
std::string version;
std::string glsl_version;
std::string vendor;
std::string renderer;
GLInfo();
void detect();
bool is_version_greater_or_equal_to(unsigned int major, unsigned int minor) const;
std::string to_string(bool format_as_html, bool extensions) const;
};
#endif // ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
#if ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
private:
#endif // ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
enum EMultisampleState : unsigned char
{
MS_Unknown,
@ -92,11 +73,7 @@ private:
CanvasesMap m_canvases;
wxGLContext* m_context;
#if ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
static GLInfo s_gl_info;
#else
GLInfo m_gl_info;
#endif // ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
bool m_gl_initialized;
bool m_use_legacy_opengl;
bool m_use_VBOs;
@ -116,9 +93,6 @@ public:
unsigned int count() const;
void init_gl();
#if !ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
std::string get_gl_info(bool format_as_html, bool extensions) const;
#endif // !ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
bool init(wxGLCanvas* canvas);
@ -131,9 +105,7 @@ public:
static wxGLCanvas* create_wxglcanvas(wxWindow *parent);
#if ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
static const GLInfo& get_gl_info() { return s_gl_info; }
#endif // ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION
private:
CanvasesMap::iterator do_get_canvas(wxGLCanvas* canvas);