moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-02 07:46:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix EGLFS state restoration after Vulkan rendering

Browse Source
This commit is contained in:
Cameron Gutman 2024-09-23 21:32:09 -05:00
parent 023b6b2772
commit 0e2d5bf441
2 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/masterhook.c
View File

@ -36,8 +36,12 @@
int g_QtDrmMasterFd = -1; int g_QtDrmMasterFd = -1;
struct stat g_DrmMasterStat; struct stat g_DrmMasterStat;
// Last CRTC state for us to restore later
drmModeCrtcPtr g_QtCrtcState;
uint32_t* g_QtCrtcConnectors;
int g_QtCrtcConnectorCount;
bool removeSdlFd(int fd); bool removeSdlFd(int fd);
bool createSdlFd();
int drmIsMaster(int fd) int drmIsMaster(int fd)
{ {
@ -62,7 +66,16 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
} }
// Call into the real thing // Call into the real thing
return ((typeof(drmModeSetCrtc)*)dlsym(RTLD_NEXT, __FUNCTION__))(fd, crtcId, bufferId, x, y, connectors, count, mode); int err = ((typeof(drmModeSetCrtc)*)dlsym(RTLD_NEXT, __FUNCTION__))(fd, crtcId, bufferId, x, y, connectors, count, mode);
if (err == 0 && fd == g_QtDrmMasterFd) {
// Store the CRTC configuration so we can restore it later
drmModeFreeCrtc(g_QtCrtcState);
g_QtCrtcState = drmModeGetCrtc(fd, crtcId);
g_QtCrtcConnectors = calloc(count, sizeof(*g_QtCrtcConnectors));
memcpy(g_QtCrtcConnectors, connectors, count * sizeof(*connectors));
g_QtCrtcConnectorCount = count;
}
return err;
} }
// This hook will handle atomic DRM rendering // This hook will handle atomic DRM rendering
@ -124,6 +137,24 @@ int close(int fd)
"Failed to restore master to Qt DRM FD: %d", "Failed to restore master to Qt DRM FD: %d",
errno); errno);
} }
// Reset the CRTC state to how Qt configured it
if (g_QtCrtcState) {
int err = ((typeof(drmModeSetCrtc)*)dlsym(RTLD_NEXT, "drmModeSetCrtc"))(g_QtDrmMasterFd,
g_QtCrtcState->crtc_id,
g_QtCrtcState->buffer_id,
g_QtCrtcState->x,
g_QtCrtcState->y,
g_QtCrtcConnectors,
g_QtCrtcConnectorCount,
g_QtCrtcState->mode_valid ?
&g_QtCrtcState->mode : NULL);
if (err < 0) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"Failed to restore CRTC state to Qt DRM FD: %d",
errno);
}
}
} }
return ret; return ret;

12
app/masterhook_internal.c
View File

@ -149,9 +149,15 @@ int openHook(const char *funcname, const char *pathname, int flags, va_list va)
} }
} }
// Insert the FD into the table if (fd >= 0) {
g_SdlDrmMasterFds[freeFdIndex] = fd; // Start with DRM master on the new FD
g_SdlDrmMasterFdCount++; drmSetMaster(fd);
// Insert the FD into the table
g_SdlDrmMasterFds[freeFdIndex] = fd;
g_SdlDrmMasterFdCount++;
}
SDL_AtomicUnlock(&g_FdTableLock); SDL_AtomicUnlock(&g_FdTableLock);
} }
} }