pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

prusaslicer: Allow running on machines with OpenGL 3.0 & 3.1



Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Mon May 20 10:26:35 2024 +1000
Changeset:	8cf1f08932b7bc640ac4581f0384e6ece586f5fa

Modified Files:
	prusaslicer/distinfo
	prusaslicer/patches/patch-src_slic3r_GUI_OpenGLManager.cpp

Log Message:
prusaslicer: Allow running on machines with OpenGL 3.0 & 3.1

Discussion in:
https://github.com/prusa3d/PrusaSlicer/issues/12334

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8cf1f08932b7bc640ac4581f0384e6ece586f5fa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 prusaslicer/distinfo                                    |  2 +-
 .../patches/patch-src_slic3r_GUI_OpenGLManager.cpp      | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diffs:
diff --git a/prusaslicer/distinfo b/prusaslicer/distinfo
index 0b165d684f..77332f2c17 100644
--- a/prusaslicer/distinfo
+++ b/prusaslicer/distinfo
@@ -40,7 +40,7 @@ SHA1 (patch-src_slic3r_GUI_InstanceCheck.hpp) = 2af0741f480c41d5cc5bd9d3e55480c8
 SHA1 (patch-src_slic3r_GUI_KBShortcutsDialog.cpp) = 82a395a10e9d0a1b049863d8d30bce2ed99cb5f2
 SHA1 (patch-src_slic3r_GUI_Mouse3DController.cpp) = bf8bf60e17e304a2022b9a80852d7ab38fc2451d
 SHA1 (patch-src_slic3r_GUI_Mouse3DController.hpp) = 6a008114e932b08951428b6fa882b41acaa85c0b
-SHA1 (patch-src_slic3r_GUI_OpenGLManager.cpp) = 594d8a99824fead23010cdbf8f97d8ba6727ddbe
+SHA1 (patch-src_slic3r_GUI_OpenGLManager.cpp) = 01bb904ac3390ce098bf9a528e2d93b09e67615f
 SHA1 (patch-src_slic3r_GUI_OptionsGroup.cpp) = c413f24a9a50069b93bdd611b95fa85ccab45567
 SHA1 (patch-src_slic3r_GUI_PhysicalPrinterDialog.cpp) = 5dbe3c5c19ce5d03b5dd310af484b712b091efda
 SHA1 (patch-src_slic3r_GUI_Plater.cpp) = 840abde0ab6e033787c301f8157a291699f31158
diff --git a/prusaslicer/patches/patch-src_slic3r_GUI_OpenGLManager.cpp b/prusaslicer/patches/patch-src_slic3r_GUI_OpenGLManager.cpp
index 9e73f8bc25..9f2dbfd6db 100644
--- a/prusaslicer/patches/patch-src_slic3r_GUI_OpenGLManager.cpp
+++ b/prusaslicer/patches/patch-src_slic3r_GUI_OpenGLManager.cpp
@@ -4,9 +4,13 @@ Workaround EGL initialisation failure.
 See discussions at, eg:
 https://github.com/nigels-com/glew/issues/273
 
---- src/slic3r/GUI/OpenGLManager.cpp.orig	2023-06-02 13:41:15.000000000 +0000
+Allow running on machines with OpenGL 3.0 & 3.1.
+Discussion in:
+https://github.com/prusa3d/PrusaSlicer/issues/12334
+
+--- src/slic3r/GUI/OpenGLManager.cpp.orig	2024-02-23 10:58:40.000000000 +0000
 +++ src/slic3r/GUI/OpenGLManager.cpp
-@@ -336,7 +336,7 @@ bool OpenGLManager::init_gl()
+@@ -344,7 +344,7 @@ bool OpenGLManager::init_gl()
          glewExperimental = true;
  #endif // ENABLE_GL_CORE_PROFILE || ENABLE_OPENGL_ES
          GLenum err = glewInit();
@@ -15,3 +19,12 @@ https://github.com/nigels-com/glew/issues/273
              BOOST_LOG_TRIVIAL(error) << "Unable to init glew library: " << glewGetErrorString(err);
              return false;
          }
+@@ -373,7 +373,7 @@ bool OpenGLManager::init_gl()
+ #if ENABLE_OPENGL_ES
+         bool valid_version = s_gl_info.is_version_greater_or_equal_to(2, 0);
+ #elif ENABLE_GL_CORE_PROFILE
+-        const bool valid_version = s_gl_info.is_version_greater_or_equal_to(3, 2);
++        const bool valid_version = s_gl_info.is_version_greater_or_equal_to(3, 0);
+ #else
+         bool valid_version = s_gl_info.is_version_greater_or_equal_to(2, 0);
+ #endif // ENABLE_OPENGL_ES


Home | Main Index | Thread Index | Old Index