GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-18 01:55:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added tech ENABLE_OPENGL_ES_2_0:

Browse Source 
ENABLE_OPENGL_ES -> Use the default version of OpenGL ES given by the driver

ENABLE_OPENGL_ES_2_0-> Select OpenGL ES 2.0 as minimum version
This commit is contained in:
enricoturri1966 2022-04-06 09:41:40 +02:00
parent dd86650c5e
commit 0260c81c9e
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Technologies.hpp
View File

@ -57,6 +57,8 @@
#define ENABLE_LEGACY_OPENGL_REMOVAL (1 && ENABLE_2_5_0_ALPHA1) #define ENABLE_LEGACY_OPENGL_REMOVAL (1 && ENABLE_2_5_0_ALPHA1)
// Enable OpenGL ES // Enable OpenGL ES
#define ENABLE_OPENGL_ES (1 && ENABLE_LEGACY_OPENGL_REMOVAL) #define ENABLE_OPENGL_ES (1 && ENABLE_LEGACY_OPENGL_REMOVAL)
// Enable OpenGL ES forcing ES 2.0 as min version
#define ENABLE_OPENGL_ES_2_0 (0 && ENABLE_OPENGL_ES)
// Enable OpenGL core profile context (tested against Mesa 20.1.8 on Windows) // Enable OpenGL core profile context (tested against Mesa 20.1.8 on Windows)
#define ENABLE_GL_CORE_PROFILE (1 && ENABLE_LEGACY_OPENGL_REMOVAL && !ENABLE_OPENGL_ES) #define ENABLE_GL_CORE_PROFILE (1 && ENABLE_LEGACY_OPENGL_REMOVAL && !ENABLE_OPENGL_ES)
// Shows an imgui dialog with GLModel statistics data // Shows an imgui dialog with GLModel statistics data

24
src/slic3r/GUI/GLSelectionRectangle.cpp
View File

@ -151,29 +151,12 @@ namespace GUI {
m_rectangle.reset(); m_rectangle.reset();
GLModel::Geometry init_data; GLModel::Geometry init_data;
#if ENABLE_OPENGL_ES #if ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
if (wxGetApp().is_gl_version_greater_or_equal_to(3, 1)) {
init_data.format = { GLModel::Geometry::EPrimitiveType::Lines, GLModel::Geometry::EVertexLayout::P4 };
init_data.reserve_vertices(8);
init_data.reserve_indices(8);
}
else {
init_data.format = { GLModel::Geometry::EPrimitiveType::LineLoop, GLModel::Geometry::EVertexLayout::P2 };
init_data.reserve_vertices(4);
init_data.reserve_indices(4);
}
#elif ENABLE_GL_CORE_PROFILE
init_data.format = { GLModel::Geometry::EPrimitiveType::Lines, GLModel::Geometry::EVertexLayout::P4 }; init_data.format = { GLModel::Geometry::EPrimitiveType::Lines, GLModel::Geometry::EVertexLayout::P4 };
init_data.reserve_vertices(8); init_data.reserve_vertices(8);
init_data.reserve_indices(8); init_data.reserve_indices(8);
#else
init_data.format = { GLModel::Geometry::EPrimitiveType::LineLoop, GLModel::Geometry::EVertexLayout::P2 };
init_data.reserve_vertices(4);
init_data.reserve_indices(4);
#endif // ENABLE_OPENGL_ES
// vertices // vertices
#if ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
const float width = right - left; const float width = right - left;
const float height = top - bottom; const float height = top - bottom;
float perimeter = 0.0f; float perimeter = 0.0f;
@ -200,6 +183,11 @@ namespace GUI {
init_data.add_line(4, 5); init_data.add_line(4, 5);
init_data.add_line(6, 7); init_data.add_line(6, 7);
#else #else
init_data.format = { GLModel::Geometry::EPrimitiveType::LineLoop, GLModel::Geometry::EVertexLayout::P2 };
init_data.reserve_vertices(4);
init_data.reserve_indices(4);
// vertices
init_data.add_vertex(Vec2f(left, bottom)); init_data.add_vertex(Vec2f(left, bottom));
init_data.add_vertex(Vec2f(right, bottom)); init_data.add_vertex(Vec2f(right, bottom));
init_data.add_vertex(Vec2f(right, top)); init_data.add_vertex(Vec2f(right, top));

8
src/slic3r/GUI/OpenGLManager.cpp
View File

@ -316,7 +316,11 @@ bool OpenGLManager::init_gl()
s_framebuffers_type = EFramebufferType::Unknown; s_framebuffers_type = EFramebufferType::Unknown;
#if ENABLE_OPENGL_ES #if ENABLE_OPENGL_ES
#if ENABLE_OPENGL_ES_2_0
bool valid_version = s_gl_info.is_version_greater_or_equal_to(2, 0); bool valid_version = s_gl_info.is_version_greater_or_equal_to(2, 0);
#else
bool valid_version = true;
#endif // ENABLE_OPENGL_ES_2_0
#elif ENABLE_GL_CORE_PROFILE #elif ENABLE_GL_CORE_PROFILE
bool valid_version = s_gl_info.is_core_profile() ? s_gl_info.is_version_greater_or_equal_to(3, 3) : s_gl_info.is_version_greater_or_equal_to(2, 0); bool valid_version = s_gl_info.is_core_profile() ? s_gl_info.is_version_greater_or_equal_to(3, 3) : s_gl_info.is_version_greater_or_equal_to(2, 0);
#else #else
@ -363,7 +367,11 @@ wxGLContext* OpenGLManager::init_glcontext(wxGLCanvas& canvas)
if (m_context == nullptr) { if (m_context == nullptr) {
#if ENABLE_OPENGL_ES #if ENABLE_OPENGL_ES
wxGLContextAttrs attrs; wxGLContextAttrs attrs;
#if ENABLE_OPENGL_ES_2_0
attrs.ES2().MajorVersion(2).EndList(); attrs.ES2().MajorVersion(2).EndList();
#else
attrs.ES2().EndList();
#endif // ENABLE_OPENGL_ES_2_0
m_context = new wxGLContext(&canvas, nullptr, &attrs); m_context = new wxGLContext(&canvas, nullptr, &attrs);
#elif ENABLE_GL_CORE_PROFILE #elif ENABLE_GL_CORE_PROFILE
wxGLContextAttrs attrs; wxGLContextAttrs attrs;