diff options
Diffstat (limited to 'src/render/Renderer.cpp')
| -rw-r--r-- | src/render/Renderer.cpp | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp index d4f1577f..22a14a25 100644 --- a/src/render/Renderer.cpp +++ b/src/render/Renderer.cpp @@ -1780,31 +1780,34 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR pMonitor->vecPixelSize = pMonitor->vecSize; - if (pMonitorRule->enable10bit) { - // try 10b RGB - wlr_output_set_render_format(pMonitor->output, DRM_FORMAT_XRGB2101010); - pMonitor->enabled10bit = true; - - if (!wlr_output_test(pMonitor->output)) { - Debug::log(ERR, "Output {} -> 10 bit enabled, but failed format DRM_FORMAT_XRGB2101010. Trying BGR.", pMonitor->output->name); + // clang-format off + static const std::array<std::vector<std::pair<std::string, uint32_t>>, 2> formats{ + std::vector<std::pair<std::string, uint32_t>>{ /* 10-bit */ + {"DRM_FORMAT_XRGB2101010", DRM_FORMAT_XRGB2101010}, {"DRM_FORMAT_XBGR2101010", DRM_FORMAT_XBGR2101010}, {"DRM_FORMAT_XRGB8888", DRM_FORMAT_XRGB8888}, {"DRM_FORMAT_XBGR8888", DRM_FORMAT_XBGR8888}, {"DRM_FORMAT_INVALID", DRM_FORMAT_INVALID} + }, + std::vector<std::pair<std::string, uint32_t>>{ /* 8-bit */ + {"DRM_FORMAT_XRGB8888", DRM_FORMAT_XRGB8888}, {"DRM_FORMAT_XBGR8888", DRM_FORMAT_XBGR8888}, {"DRM_FORMAT_INVALID", DRM_FORMAT_INVALID} + } + }; + // clang-format on - wlr_output_set_render_format(pMonitor->output, DRM_FORMAT_XBGR2101010); + bool set10bit = false; - if (!wlr_output_test(pMonitor->output)) { - Debug::log(ERR, "Output {} -> 10 bit enabled, but failed format DRM_FORMAT_XBGR2101010. Falling back to 8 bit.", pMonitor->output->name); + for (auto& fmt : formats[(int)!pMonitorRule->enable10bit]) { + wlr_output_set_render_format(pMonitor->output, fmt.second); - wlr_output_set_render_format(pMonitor->output, DRM_FORMAT_XRGB8888); - } else { - Debug::log(LOG, "10bit format DRM_FORMAT_XBGR2101010 succeeded for output {}", pMonitor->output->name); - } + if (!wlr_output_test(pMonitor->output)) { + Debug::log(ERR, "output {} failed basic test on format {}", pMonitor->szName, fmt.first); } else { - Debug::log(LOG, "10bit format DRM_FORMAT_XRGB2101010 succeeded for output {}", pMonitor->output->name); + Debug::log(LOG, "output {} succeeded basic test on format {}", pMonitor->szName, fmt.first); + if (pMonitorRule->enable10bit && fmt.first.contains("101010")) + set10bit = true; + break; } - } else { - wlr_output_set_render_format(pMonitor->output, DRM_FORMAT_XRGB8888); - pMonitor->enabled10bit = false; } + pMonitor->enabled10bit = set10bit; + if (!wlr_output_commit(pMonitor->output)) { Debug::log(ERR, "Couldn't commit output named {}", pMonitor->output->name); } |