simple-egl working

Signed-off-by: Joel Winarske <[email protected]>
jwinarske · Apr 25, 2024 · c2d01bb · c2d01bb
1 parent 9c73f22
commit c2d01bb
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 33 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -20,21 +20,19 @@ pkg_check_modules(GLESv2 IMPORTED_TARGET glesv2)
 #
 # simple-egl
 #
-if (OFF)
-    add_executable(simple-egl simple-egl.cc)
-    target_include_directories(simple-egl PRIVATE ${CMAKE_SOURCE_DIR}/include)
+add_executable(simple-egl simple-egl.cc)
+target_include_directories(simple-egl PRIVATE ${CMAKE_SOURCE_DIR}/include)
 
-    target_compile_definitions(simple-egl PRIVATE EGL_NO_X11 MESA_EGL_NO_X11_HEADERS)
+target_compile_definitions(simple-egl PRIVATE EGL_NO_X11 MESA_EGL_NO_X11_HEADERS)
 
-    target_link_libraries(simple-egl PRIVATE waypp PkgConfig::GLESv2 cxxopts::cxxopts)
+target_link_libraries(simple-egl PRIVATE waypp PkgConfig::GLESv2 cxxopts::cxxopts)
 
-    if (IPO_SUPPORT_RESULT)
-        set_property(TARGET simple-egl PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
-    endif ()
-
-    add_sanitizers(simple-egl)
+if (IPO_SUPPORT_RESULT)
+    set_property(TARGET simple-egl PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
 endif ()
 
+add_sanitizers(simple-egl)
+
 #
 # simple-shm
 #

diff --git a/examples/simple-egl.cc b/examples/simple-egl.cc
@@ -20,13 +20,8 @@
 #include <cxxopts.hpp>
 #include <sys/time.h>
 
-#include <glm/ext/matrix_transform.hpp>
+#include "window/xdg_toplevel.h"
 
-#include "window_manager/registrar.h"
-#include "window_manager/xdg_window_manager.h"
-#include "window/window.h"
-
-#include "config.h"
 #include "logging.h"
 
 static volatile bool running = true;
@@ -455,17 +450,26 @@ int main(int argc, char **argv) {
     spdlog::info("vertical_bar: {}", config.vertical_bar);
 
     XdgWindowManager wm;
-    auto window = wm.CreateTopLevel("simple-egl", config.width, config.height, WL_OUTPUT_TRANSFORM_NORMAL,
-                                    config.fullscreen,
-                                    config.maximized,
-                                    config.fullscreen_ratio, config.tearing, draw_frame,
-                                    kEglContextAttribs.data(), kEglContextAttribs.size(),
-                                    kEglConfigAttribs.data(), kEglConfigAttribs.size(),
-                                    config.buffer_bpp, config.interval);
-
-    while (running && wm.dispatch_pending() != -1) {
-        draw_frame(window, 0);
-    }
+    auto top_level = wm.CreateTopLevel("simple-egl",
+                                       config.width,
+                                       config.height,
+                                       0,
+                                       0,
+                                       config.fullscreen,
+                                       config.maximized,
+                                       config.fullscreen_ratio,
+                                       config.tearing,
+                                       draw_frame,
+                                       kEglContextAttribs.data(), kEglContextAttribs.size(),
+                                       kEglConfigAttribs.data(), kEglConfigAttribs.size(),
+                                       config.buffer_bpp, config.interval);
+
+    top_level->update_buffer_geometry();
+    top_level->start_frame_callbacks();
+
+    while (running && top_level->is_valid() && wm.display_dispatch() != -1) {}
+
+    top_level->stop_frame_callbacks();
 
     return EXIT_SUCCESS;
 }
diff --git a/examples/simple-shm.cc b/examples/simple-shm.cc
@@ -2,11 +2,8 @@
 
 #include <cxxopts.hpp>
 
-#include "window_manager/registrar.h"
-#include "window_manager/xdg_window_manager.h"
 #include "window/xdg_toplevel.h"
 
-#include "config.h"
 #include "logging.h"
 
 typedef struct {
@@ -18,8 +15,6 @@ typedef struct {
     bool tearing;
 } CONFIGURATION_T;
 
-std::unique_ptr<Logging> gLogging;
-
 static volatile bool running = true;
 
 
@@ -106,7 +101,7 @@ void draw_frame(void *data, const uint32_t time) {
 
 int main(int argc, char **argv) {
 
-    gLogging = std::make_unique<Logging>();
+    auto gLogging = std::make_unique<Logging>();
 
     std::signal(SIGINT, handle_signal);