Skip to content
This repository was archived by the owner on Jul 10, 2025. It is now read-only.

Use VisdualGlfw in compute_manager #489

Merged
sebjameswml merged 1 commit into from
Jun 6, 2025
Merged

Use VisdualGlfw in compute_manager #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions morph/VisualGlfw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,13 @@ namespace morph {
VisualGlfw() { }
~VisualGlfw() { glfwTerminate(); }

bool initialized = false;

public:
void init()
{
if (this->initialized) { return; } // as already initialized

if (!glfwInit()) { std::cerr << "GLFW initialization failed!\n"; }

// Set up error callback
Expand All @@ -48,6 +52,8 @@ namespace morph {
#endif
// Tell glfw that we'd like to do anti-aliasing.
glfwWindowHint (GLFW_SAMPLES, 4);

this->initialized = true;
}

//! An error callback function for the GLFW windowing library
Expand Down
15 changes: 2 additions & 13 deletions morph/gl/compute_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

#include <chrono>
#include <morph/VisualDefaultShaders.h>
#include <morph/VisualGlfw.h>

namespace morph {
namespace gl {
Expand All @@ -52,7 +53,6 @@ namespace morph {
~compute_manager()
{
glfwDestroyWindow (this->window);
glfwTerminate();
}

//! Init GLFW and then the GLFW window. What if you want to set window width
Expand Down Expand Up @@ -100,21 +100,11 @@ namespace morph {

void init_glfw()
{
if (!glfwInit()) { std::cerr << "GLFW initialization failed!\n"; }
// Set up error callback
glfwSetErrorCallback (morph::gl::compute_manager<glver>::errorCallback);
morph::VisualGlfw<glver>::i().init();
// See https://www.glfw.org/docs/latest/monitor_guide.html
GLFWmonitor* primary = glfwGetPrimaryMonitor();
glfwGetMonitorContentScale (primary, &this->monitor_xscale, &this->monitor_yscale);
glfwGetMonitorWorkarea (primary, &this->workarea_xpos, &this->workarea_ypos, &this->workarea_width, &this->workarea_height);
// 4.3+ or 3.1ES+ are required for shader compute
if constexpr (morph::gl::version::gles (glver) == true) {
glfwWindowHint (GLFW_CLIENT_API, GLFW_OPENGL_ES_API);
glfwWindowHint (GLFW_CONTEXT_CREATION_API, GLFW_EGL_CONTEXT_API);
}
glfwWindowHint (GLFW_CONTEXT_VERSION_MAJOR, morph::gl::version::major (glver));
glfwWindowHint (GLFW_CONTEXT_VERSION_MINOR, morph::gl::version::minor (glver));
morph::gl::Util::checkError (__FILE__, __LINE__);
}

void init_window()
Expand All @@ -131,7 +121,6 @@ namespace morph {
// Lastly make the context current
glfwMakeContextCurrent (this->window);
glfwSwapInterval (0);
morph::gl::Util::checkError (__FILE__, __LINE__);
}

// Initialize OpenGL shaders, set any GL flags required
Expand Down
Loading