no no null confures

This commit is contained in:
Vaxry 2024-02-21 16:00:14 +00:00
parent 0127370429
commit 0bd620384d
2 changed files with 6 additions and 13 deletions

View file

@ -58,22 +58,19 @@ CSessionLockSurface::CSessionLockSurface(COutput* output) : output(output) {
exit(1);
}
configure(output->size, {});
ext_session_lock_surface_v1_add_listener(lockSurface, &lockListener, this);
}
void CSessionLockSurface::configure(const Vector2D& size_, std::optional<uint32_t> serial_) {
Debug::log(LOG, "configure with serial {}", serial_.value_or(0));
void CSessionLockSurface::configure(const Vector2D& size_, uint32_t serial_) {
Debug::log(LOG, "configure with serial {}", serial_);
serial = serial_.value_or(0);
serial = serial_;
size = (size_ * fractionalScale).floor();
logicalSize = size_;
Debug::log(LOG, "Configuring surface for logical {} and pixel {}", logicalSize, size);
if (serial_.has_value())
ext_session_lock_surface_v1_ack_configure(lockSurface, serial);
ext_session_lock_surface_v1_ack_configure(lockSurface, serial);
if (fractional)
wp_viewport_set_destination(viewport, logicalSize.x, logicalSize.y);
@ -101,10 +98,7 @@ void CSessionLockSurface::configure(const Vector2D& size_, std::optional<uint32_
readyForFrame = true;
if (serial_.has_value())
render();
else
eglSwapBuffers(g_pEGL->eglDisplay, eglSurface);
render();
}
static void handleDone(void* data, wl_callback* wl_callback, uint32_t callback_data) {

View file

@ -7,7 +7,6 @@
#include <wayland-egl.h>
#include "../helpers/Vector2D.hpp"
#include <EGL/egl.h>
#include <optional>
class COutput;
class CRenderer;
@ -17,7 +16,7 @@ class CSessionLockSurface {
CSessionLockSurface(COutput* output);
~CSessionLockSurface();
void configure(const Vector2D& size, std::optional<uint32_t> serial);
void configure(const Vector2D& size, uint32_t serial);
bool readyForFrame = false;