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

opengl: minor adjustment to getPreferredReadFormat

Browse source 
fixes #4791
This commit is contained in:
Vaxry 2024-03-19 02:42:30 +00:00
parent 7283dde878
commit 49f5fd59ad
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/protocols/ToplevelExport.cpp
View file

@ -179,17 +179,6 @@ void CToplevelExportProtocolManager::captureToplevel(wl_client* client, wl_resou
g_pHyprRenderer->makeEGLCurrent(); g_pHyprRenderer->makeEGLCurrent();
if (g_pHyprOpenGL->m_mMonitorRenderResources.contains(PMONITOR)) {
const auto& RDATA = g_pHyprOpenGL->m_mMonitorRenderResources.at(PMONITOR);
// bind the fb for its format. Suppress gl errors.
#ifndef GLES2
glBindFramebuffer(GL_READ_FRAMEBUFFER, RDATA.offloadFB.m_iFb);
#else
glBindFramebuffer(GL_FRAMEBUFFER, RDATA.offloadFB.m_iFb);
#endif
} else
Debug::log(ERR, "No RDATA in toplevelexport???");
PFRAME->shmFormat = g_pHyprOpenGL->getPreferredReadFormat(PMONITOR); PFRAME->shmFormat = g_pHyprOpenGL->getPreferredReadFormat(PMONITOR);
if (PFRAME->shmFormat == DRM_FORMAT_INVALID) { if (PFRAME->shmFormat == DRM_FORMAT_INVALID) {
Debug::log(ERR, "No format supported by renderer in capture toplevel"); Debug::log(ERR, "No format supported by renderer in capture toplevel");

6
src/render/OpenGL.cpp
View file

@ -2286,10 +2286,10 @@ inline const SGLPixelFormat GLES2_FORMATS[] = {
}; };
uint32_t CHyprOpenGLImpl::getPreferredReadFormat(CMonitor* pMonitor) { uint32_t CHyprOpenGLImpl::getPreferredReadFormat(CMonitor* pMonitor) {
GLint glf = -1, glt = -1, as = -1; GLint glf = -1, glt = -1, as = 0;
glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT, &glf); /*glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT, &glf);
glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE, &glt); glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE, &glt);
glGetIntegerv(GL_ALPHA_BITS, &as); glGetIntegerv(GL_ALPHA_BITS, &as);*/
if (glf == 0 || glt == 0) { if (glf == 0 || glt == 0) {
glf = drmFormatToGL(pMonitor->drmFormat); glf = drmFormatToGL(pMonitor->drmFormat);