diff options
| author | Tom Englund <tomenglund26@gmail.com> | 2025-09-27 18:46:26 +0200 |
|---|---|---|
| committer | Vaxry <43317083+vaxerski@users.noreply.github.com> | 2025-09-28 23:20:52 +0200 |
| commit | eb25dfd399d481ce770c8851416b70b077892afc (patch) | |
| tree | 91f1810996f6e001d4e9e964b5b17bc43266ba8b /src/render | |
| parent | b627885788acbab4c768632f800e010467ffbaf9 (diff) | |
opengl: move from unordered_set to array
setCapStatus is a a heavy used function in hot rendering paths, it
shows up in profiling as using a bit of cpu just because of
unordered_set hashing etc, move to a enum and array and cache only the
heavily used ones.
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/OpenGL.cpp | 34 | ||||
| -rw-r--r-- | src/render/OpenGL.hpp | 10 |
2 files changed, 34 insertions, 10 deletions
diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp index e1ecdd2f..fd5ce164 100644 --- a/src/render/OpenGL.cpp +++ b/src/render/OpenGL.cpp @@ -3170,18 +3170,36 @@ void CHyprOpenGLImpl::setViewport(GLint x, GLint y, GLsizei width, GLsizei heigh } void CHyprOpenGLImpl::setCapStatus(int cap, bool status) { - // check if the capability status is already set to the desired status - auto it = m_capStatus.find(cap); - bool currentStatus = (it != m_capStatus.end()) ? it->second : false; // default to 'false' if not found + const auto getCapIndex = [cap]() { + switch (cap) { + case GL_BLEND: return CAP_STATUS_BLEND; + case GL_SCISSOR_TEST: return CAP_STATUS_SCISSOR_TEST; + case GL_STENCIL_TEST: return CAP_STATUS_STENCIL_TEST; + default: return CAP_STATUS_END; + } + }; + + auto idx = getCapIndex(); + + if (idx == CAP_STATUS_END) { + if (status) + glEnable(cap); + else + glDisable(cap); - if (currentStatus == status) return; + } - m_capStatus[cap] = status; + if (m_capStatus[idx] == status) + return; - // Enable or disable the capability based on status - auto func = status ? [](int c) { glEnable(c); } : [](int c) { glDisable(c); }; - func(cap); + if (status) { + m_capStatus[idx] = status; + glEnable(cap); + } else { + m_capStatus[idx] = status; + glDisable(cap); + } } uint32_t CHyprOpenGLImpl::getPreferredReadFormat(PHLMONITOR pMonitor) { diff --git a/src/render/OpenGL.hpp b/src/render/OpenGL.hpp index a69ebbfe..a6dbd339 100644 --- a/src/render/OpenGL.hpp +++ b/src/render/OpenGL.hpp @@ -11,7 +11,6 @@ #include <cstdint> #include <list> #include <string> -#include <unordered_map> #include <stack> #include <map> @@ -341,6 +340,13 @@ class CHyprOpenGLImpl { eEGLContextVersion m_eglContextVersion = EGL_CONTEXT_GLES_3_2; + enum eCachedCapStatus : uint8_t { + CAP_STATUS_BLEND = 0, + CAP_STATUS_SCISSOR_TEST, + CAP_STATUS_STENCIL_TEST, + CAP_STATUS_END + }; + private: struct { GLint x = 0; @@ -349,7 +355,7 @@ class CHyprOpenGLImpl { GLsizei height = 0; } m_lastViewport; - std::unordered_map<int, bool> m_capStatus; + std::array<bool, CAP_STATUS_END> m_capStatus; std::vector<SDRMFormat> m_drmFormats; bool m_hasModifiers = false; |
