hyprwm/hyprlock
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlock.git synced 2024-11-16 23:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

core: Nvidia and stuff fixes (#44)

Browse source 
* nvidia and stuff fixes

* no no null confures

* drop stupid roundtrip
This commit is contained in:
Vaxry 2024-02-21 16:56:25 +00:00 committed by GitHub
parent 6355216f48
commit 9d8ee2a1d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/core/LockSurface.cpp
View file

@ -47,13 +47,8 @@ CSessionLockSurface::CSessionLockSurface(COutput* output) : output(output) {
if (fractional) { if (fractional) {
wp_fractional_scale_v1_add_listener(fractional, &fsListener, this); wp_fractional_scale_v1_add_listener(fractional, &fsListener, this);
viewport = wp_viewporter_get_viewport(g_pHyprlock->getViewporter(), surface); viewport = wp_viewporter_get_viewport(g_pHyprlock->getViewporter(), surface);
wl_display_roundtrip(g_pHyprlock->getDisplay()); } else
} else {
Debug::log(LOG, "No fractional-scale support! Oops, won't be able to scale!"); Debug::log(LOG, "No fractional-scale support! Oops, won't be able to scale!");
}
configure(output->size, 0);
g_pRenderer->renderLock(*this);
lockSurface = ext_session_lock_v1_get_lock_surface(g_pHyprlock->getSessionLock(), surface, output->output); lockSurface = ext_session_lock_v1_get_lock_surface(g_pHyprlock->getSessionLock(), surface, output->output);
@ -63,8 +58,6 @@ CSessionLockSurface::CSessionLockSurface(COutput* output) : output(output) {
} }
ext_session_lock_surface_v1_add_listener(lockSurface, &lockListener, this); ext_session_lock_surface_v1_add_listener(lockSurface, &lockListener, this);
wl_display_roundtrip(g_pHyprlock->getDisplay());
wl_display_flush(g_pHyprlock->getDisplay());
} }
void CSessionLockSurface::configure(const Vector2D& size_, uint32_t serial_) { void CSessionLockSurface::configure(const Vector2D& size_, uint32_t serial_) {
@ -76,8 +69,7 @@ void CSessionLockSurface::configure(const Vector2D& size_, uint32_t serial_) {
Debug::log(LOG, "Configuring surface for logical {} and pixel {}", logicalSize, size); Debug::log(LOG, "Configuring surface for logical {} and pixel {}", logicalSize, size);
if (serial != 0) ext_session_lock_surface_v1_ack_configure(lockSurface, serial);
ext_session_lock_surface_v1_ack_configure(lockSurface, serial);
if (fractional) if (fractional)
wp_viewport_set_destination(viewport, logicalSize.x, logicalSize.y); wp_viewport_set_destination(viewport, logicalSize.x, logicalSize.y);
@ -95,7 +87,7 @@ void CSessionLockSurface::configure(const Vector2D& size_, uint32_t serial_) {
exit(1); exit(1);
} }
if (serial == 0) if (!eglSurface)
eglSurface = g_pEGL->eglCreatePlatformWindowSurfaceEXT(g_pEGL->eglDisplay, g_pEGL->eglConfig, eglWindow, nullptr); eglSurface = g_pEGL->eglCreatePlatformWindowSurfaceEXT(g_pEGL->eglDisplay, g_pEGL->eglConfig, eglWindow, nullptr);
if (!eglSurface) { if (!eglSurface) {
@ -105,18 +97,7 @@ void CSessionLockSurface::configure(const Vector2D& size_, uint32_t serial_) {
readyForFrame = true; readyForFrame = true;
if (serial != 0) render();
render();
if (fractional)
wp_viewport_set_destination(viewport, logicalSize.x, logicalSize.y);
wl_surface_set_buffer_scale(surface, 1);
wl_surface_damage_buffer(surface, 0, 0, 0xFFFF, 0xFFFF);
wl_surface_commit(surface);
wl_display_roundtrip(g_pHyprlock->getDisplay());
wl_display_flush(g_pHyprlock->getDisplay());
} }
static void handleDone(void* data, wl_callback* wl_callback, uint32_t callback_data) { static void handleDone(void* data, wl_callback* wl_callback, uint32_t callback_data) {
@ -138,15 +119,9 @@ void CSessionLockSurface::render() {
const auto FEEDBACK = g_pRenderer->renderLock(*this); const auto FEEDBACK = g_pRenderer->renderLock(*this);
frameCallback = wl_surface_frame(surface); frameCallback = wl_surface_frame(surface);
wl_callback_add_listener(frameCallback, &callbackListener, this); wl_callback_add_listener(frameCallback, &callbackListener, this);
eglSwapBuffers(g_pEGL->eglDisplay, eglSurface); eglSwapBuffers(g_pEGL->eglDisplay, eglSurface);
if (fractional)
wp_viewport_set_destination(viewport, logicalSize.x, logicalSize.y);
wl_surface_damage_buffer(surface, 0, 0, 0xFFFF, 0xFFFF);
wl_surface_set_buffer_scale(surface, 1);
wl_surface_commit(surface);
needsFrame = FEEDBACK.needsFrame; needsFrame = FEEDBACK.needsFrame;
} }