diff options
Diffstat (limited to 'src/render/OpenGL.cpp')
| -rw-r--r-- | src/render/OpenGL.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp index c2c19993..d466dc82 100644 --- a/src/render/OpenGL.cpp +++ b/src/render/OpenGL.cpp @@ -15,7 +15,7 @@ #include "../helpers/CursorShapes.hpp" #include "../helpers/TransferFunction.hpp" #include "../config/ConfigValue.hpp" -#include "../config/ConfigManager.hpp" +#include "../config/legacy/ConfigManager.hpp" #include "../managers/PointerManager.hpp" #include "../desktop/view/LayerSurface.hpp" #include "../desktop/state/FocusState.hpp" @@ -889,21 +889,21 @@ void CHyprOpenGLImpl::applyScreenShader(const std::string& path) { if (path.empty() || path == STRVAL_EMPTY) return; - std::string absPath = absolutePath(path, g_pConfigManager->getMainConfigPath()); + std::string absPath = absolutePath(path, Config::mgr()->getMainConfigPath()); std::error_code ec; if (!std::filesystem::is_regular_file(absPath, ec)) { if (ec) - g_pConfigManager->addParseError("Screen shader parser: Failed to check screen shader path: " + ec.message()); + g_pHyprError->queueError("Screen shader parser: Failed to check screen shader path: " + ec.message()); else - g_pConfigManager->addParseError("Screen shader parser: Screen shader path is not a regular file"); + g_pHyprError->queueError("Screen shader parser: Screen shader path is not a regular file"); return; } std::ifstream infile(absPath); if (!infile.good()) { - g_pConfigManager->addParseError("Screen shader parser: Failed to open screen shader"); + g_pHyprError->queueError("Screen shader parser: Failed to open screen shader"); return; } @@ -930,9 +930,9 @@ void CHyprOpenGLImpl::applyScreenShader(const std::string& path) { // The screen shader uses the uniform // Since the screen shader could change every frame, damage tracking *needs* to be disabled - g_pConfigManager->addParseError(std::format("Screen shader: Screen shader uses uniform '{}', which requires debug:damage_tracking to be switched off.\n" - "WARNING:(Disabling damage tracking will *massively* increase GPU utilization!", - name)); + g_pHyprError->queueError(std::format("Screen shader: Screen shader uses uniform '{}', which requires debug:damage_tracking to be switched off.\n" + "WARNING:(Disabling damage tracking will *massively* increase GPU utilization!", + name)); }; // Allow glitch shader to use time uniform whighout damage tracking @@ -2029,7 +2029,7 @@ void CHyprOpenGLImpl::renderTextureWithBlurInternal(SP<ITexture> tex, const CBox scissor(nullptr); } -void CHyprOpenGLImpl::renderBorder(const CBox& box, const CGradientValueData& grad, SBorderRenderData data) { +void CHyprOpenGLImpl::renderBorder(const CBox& box, const Config::CGradientValueData& grad, SBorderRenderData data) { auto& m_renderData = g_pHyprRenderer->m_renderData; RASSERT((box.width > 0 && box.height > 0), "Tried to render rect with width/height < 0!"); RASSERT(m_renderData.pMonitor, "Tried to render rect without begin()!"); @@ -2115,7 +2115,7 @@ void CHyprOpenGLImpl::renderBorder(const CBox& box, const CGradientValueData& gr blend(BLEND); } -void CHyprOpenGLImpl::renderBorder(const CBox& box, const CGradientValueData& grad1, const CGradientValueData& grad2, float lerp, SBorderRenderData data) { +void CHyprOpenGLImpl::renderBorder(const CBox& box, const Config::CGradientValueData& grad1, const Config::CGradientValueData& grad2, float lerp, SBorderRenderData data) { auto& m_renderData = g_pHyprRenderer->m_renderData; RASSERT((box.width > 0 && box.height > 0), "Tried to render rect with width/height < 0!"); RASSERT(m_renderData.pMonitor, "Tried to render rect without begin()!"); |