summaryrefslogtreecommitdiff
path: root/src/render
diff options
context:
space:
mode:
Diffstat (limited to 'src/render')
-rw-r--r--src/render/OpenGL.hpp83
-rw-r--r--src/render/pass/Pass.cpp67
-rw-r--r--src/render/pass/Pass.hpp7
3 files changed, 113 insertions, 44 deletions
diff --git a/src/render/OpenGL.hpp b/src/render/OpenGL.hpp
index e73a3119..4fceabc5 100644
--- a/src/render/OpenGL.hpp
+++ b/src/render/OpenGL.hpp
@@ -166,59 +166,62 @@ class CHyprOpenGLImpl {
CHyprOpenGLImpl();
~CHyprOpenGLImpl();
- void begin(PHLMONITOR, const CRegion& damage, CFramebuffer* fb = nullptr, std::optional<CRegion> finalDamage = {});
- void beginSimple(PHLMONITOR, const CRegion& damage, SP<CRenderbuffer> rb = nullptr, CFramebuffer* fb = nullptr);
- void end();
+ void begin(PHLMONITOR, const CRegion& damage, CFramebuffer* fb = nullptr, std::optional<CRegion> finalDamage = {});
+ void beginSimple(PHLMONITOR, const CRegion& damage, SP<CRenderbuffer> rb = nullptr, CFramebuffer* fb = nullptr);
+ void end();
- void renderRect(CBox*, const CHyprColor&, int round = 0);
- void renderRectWithBlur(CBox*, const CHyprColor&, int round = 0, float blurA = 1.f, bool xray = false);
- void renderRectWithDamage(CBox*, const CHyprColor&, const CRegion& damage, int round = 0);
- void renderTexture(SP<CTexture>, CBox*, float a, int round = 0, bool discardActive = false, bool allowCustomUV = false);
- void renderTextureWithDamage(SP<CTexture>, CBox*, const CRegion& damage, float a, int round = 0, bool discardActive = false, bool allowCustomUV = false,
- SP<CSyncTimeline> waitTimeline = nullptr, uint64_t waitPoint = 0);
- void renderTextureWithBlur(SP<CTexture>, CBox*, float a, SP<CWLSurfaceResource> pSurface, int round = 0, bool blockBlurOptimization = false, float blurA = 1.f);
- void renderRoundedShadow(CBox*, int round, int range, const CHyprColor& color, float a = 1.0);
- void renderBorder(CBox*, const CGradientValueData&, int round, int borderSize, float a = 1.0, int outerRound = -1 /* use round */);
- void renderBorder(CBox*, const CGradientValueData&, const CGradientValueData&, float lerp, int round, int borderSize, float a = 1.0, int outerRound = -1 /* use round */);
- void renderTextureMatte(SP<CTexture> tex, CBox* pBox, CFramebuffer& matte);
+ void renderRect(CBox*, const CHyprColor&, int round = 0);
+ void renderRectWithBlur(CBox*, const CHyprColor&, int round = 0, float blurA = 1.f, bool xray = false);
+ void renderRectWithDamage(CBox*, const CHyprColor&, const CRegion& damage, int round = 0);
+ void renderTexture(SP<CTexture>, CBox*, float a, int round = 0, bool discardActive = false, bool allowCustomUV = false);
+ void renderTextureWithDamage(SP<CTexture>, CBox*, const CRegion& damage, float a, int round = 0, bool discardActive = false, bool allowCustomUV = false,
+ SP<CSyncTimeline> waitTimeline = nullptr, uint64_t waitPoint = 0);
+ void renderTextureWithBlur(SP<CTexture>, CBox*, float a, SP<CWLSurfaceResource> pSurface, int round = 0, bool blockBlurOptimization = false, float blurA = 1.f);
+ void renderRoundedShadow(CBox*, int round, int range, const CHyprColor& color, float a = 1.0);
+ void renderBorder(CBox*, const CGradientValueData&, int round, int borderSize, float a = 1.0, int outerRound = -1 /* use round */);
+ void renderBorder(CBox*, const CGradientValueData&, const CGradientValueData&, float lerp, int round, int borderSize, float a = 1.0, int outerRound = -1 /* use round */);
+ void renderTextureMatte(SP<CTexture> tex, CBox* pBox, CFramebuffer& matte);
- void setMonitorTransformEnabled(bool enabled);
- void setRenderModifEnabled(bool enabled);
+ void setMonitorTransformEnabled(bool enabled);
+ void setRenderModifEnabled(bool enabled);
- void saveMatrix();
- void setMatrixScaleTranslate(const Vector2D& translate, const float& scale);
- void restoreMatrix();
+ void saveMatrix();
+ void setMatrixScaleTranslate(const Vector2D& translate, const float& scale);
+ void restoreMatrix();
- void blend(bool enabled);
+ void blend(bool enabled);
- bool shouldUseNewBlurOptimizations(PHLLS pLayer, PHLWINDOW pWindow);
+ bool shouldUseNewBlurOptimizations(PHLLS pLayer, PHLWINDOW pWindow);
- void clear(const CHyprColor&);
- void clearWithTex();
- void scissor(const CBox*, bool transform = true);
- void scissor(const pixman_box32*, bool transform = true);
- void scissor(const int x, const int y, const int w, const int h, bool transform = true);
+ void clear(const CHyprColor&);
+ void clearWithTex();
+ void scissor(const CBox*, bool transform = true);
+ void scissor(const pixman_box32*, bool transform = true);
+ void scissor(const int x, const int y, const int w, const int h, bool transform = true);
- void destroyMonitorResources(PHLMONITOR);
+ void destroyMonitorResources(PHLMONITOR);
- void markBlurDirtyForMonitor(PHLMONITOR);
+ void markBlurDirtyForMonitor(PHLMONITOR);
- void preWindowPass();
- bool preBlurQueued();
- void preRender(PHLMONITOR);
+ void preWindowPass();
+ bool preBlurQueued();
+ void preRender(PHLMONITOR);
- void saveBufferForMirror(CBox*);
- void renderMirrored();
+ void saveBufferForMirror(CBox*);
+ void renderMirrored();
- void applyScreenShader(const std::string& path);
+ void applyScreenShader(const std::string& path);
- void bindOffMain();
- void renderOffToMain(CFramebuffer* off);
- void bindBackOnMain();
+ void bindOffMain();
+ void renderOffToMain(CFramebuffer* off);
+ void bindBackOnMain();
- void setDamage(const CRegion& damage, std::optional<CRegion> finalDamage = {});
+ SP<CTexture> loadAsset(const std::string& file);
+ SP<CTexture> renderText(const std::string& text, CHyprColor col, int pt, bool italic = false);
- uint32_t getPreferredReadFormat(PHLMONITOR pMonitor);
+ void setDamage(const CRegion& damage, std::optional<CRegion> finalDamage = {});
+
+ uint32_t getPreferredReadFormat(PHLMONITOR pMonitor);
std::vector<SDRMFormat> getDRMFormats();
EGLImageKHR createEGLImage(const Aquamarine::SDMABUFAttrs& attrs);
SP<CEGLSync> createEGLSync(int fenceFD);
@@ -298,8 +301,6 @@ class CHyprOpenGLImpl {
void initDRMFormats();
void initEGL(bool gbm);
EGLDeviceEXT eglDeviceFromDRMFD(int drmFD);
- SP<CTexture> loadAsset(const std::string& file);
- SP<CTexture> renderText(const std::string& text, CHyprColor col, int pt, bool italic = false);
void initAssets();
void initMissingAssetTexture();
diff --git a/src/render/pass/Pass.cpp b/src/render/pass/Pass.cpp
index f71bd562..a2ecddaa 100644
--- a/src/render/pass/Pass.cpp
+++ b/src/render/pass/Pass.cpp
@@ -3,6 +3,10 @@
#include <algorithm>
#include <ranges>
#include "../../config/ConfigValue.hpp"
+#include "../../desktop/WLSurface.hpp"
+#include "../../managers/SeatManager.hpp"
+#include "../../managers/eventLoop/EventLoopManager.hpp"
+#include "../../Compositor.hpp"
bool CRenderPass::empty() const {
return false;
@@ -120,6 +124,15 @@ CRegion CRenderPass::render(const CRegion& damage_) {
return damage;
}
+ if (!*PDEBUGPASS && debugData.present)
+ debugData = {false};
+ else if (*PDEBUGPASS && !debugData.present) {
+ debugData.present = true;
+ debugData.keyboardFocusText = g_pHyprOpenGL->renderText("keyboard", Colors::WHITE, 12);
+ debugData.pointerFocusText = g_pHyprOpenGL->renderText("pointer", Colors::WHITE, 12);
+ debugData.lastWindowText = g_pHyprOpenGL->renderText("lastWindow", Colors::WHITE, 12);
+ }
+
if (WILLBLUR && !*PDEBUGPASS) {
// combine blur regions into one that will be expanded
CRegion blurRegion;
@@ -171,15 +184,63 @@ CRegion CRenderPass::render(const CRegion& damage_) {
}
if (*PDEBUGPASS) {
- CBox monbox = {{}, g_pHyprOpenGL->m_RenderData.pMonitor->vecTransformedSize};
- g_pHyprOpenGL->renderRectWithDamage(&monbox, CHyprColor{1.F, 0.1F, 0.1F, 0.5F}, occludedRegion);
- g_pHyprOpenGL->renderRectWithDamage(&monbox, CHyprColor{0.1F, 1.F, 0.1F, 0.5F}, totalLiveBlurRegion);
+ renderDebugData();
+ g_pEventLoopManager->doLater([] {
+ for (auto& m : g_pCompositor->m_vMonitors) {
+ g_pHyprRenderer->damageMonitor(m);
+ }
+ });
}
g_pHyprOpenGL->m_RenderData.damage = damage;
return damage;
}
+void CRenderPass::renderDebugData() {
+ CBox box = {{}, g_pHyprOpenGL->m_RenderData.pMonitor->vecTransformedSize};
+ g_pHyprOpenGL->renderRectWithDamage(&box, Colors::RED.modifyA(0.1F), occludedRegion);
+ g_pHyprOpenGL->renderRectWithDamage(&box, Colors::GREEN.modifyA(0.1F), totalLiveBlurRegion);
+
+ std::unordered_map<CWLSurfaceResource*, float> offsets;
+
+ // render focus stuff
+ auto renderHLSurface = [&offsets](SP<CTexture> texture, SP<CWLSurfaceResource> surface, const CHyprColor& color) {
+ if (!surface || !texture)
+ return;
+
+ auto hlSurface = CWLSurface::fromResource(surface);
+ if (!hlSurface)
+ return;
+
+ auto bb = hlSurface->getSurfaceBoxGlobal();
+
+ if (!bb.has_value())
+ return;
+
+ CBox box = bb->copy().translate(-g_pHyprOpenGL->m_RenderData.pMonitor->vecPosition).scale(g_pHyprOpenGL->m_RenderData.pMonitor->scale);
+
+ if (box.intersection(CBox{{}, g_pHyprOpenGL->m_RenderData.pMonitor->vecSize}).empty())
+ return;
+
+ if (offsets.contains(surface.get()))
+ box.translate(Vector2D{0.F, offsets[surface.get()]});
+ else
+ offsets[surface.get()] = 0;
+
+ g_pHyprOpenGL->renderRectWithDamage(&box, Colors::PURPLE.modifyA(0.1F), CRegion{0, 0, INT32_MAX, INT32_MAX});
+ box = {box.pos(), texture->m_vSize};
+ g_pHyprOpenGL->renderRectWithDamage(&box, CHyprColor{0.F, 0.F, 0.F, 0.2F}, CRegion{0, 0, INT32_MAX, INT32_MAX}, std::min(5.0, box.size().y));
+ g_pHyprOpenGL->renderTexture(texture, &box, 1.F);
+
+ offsets[surface.get()] += texture->m_vSize.y;
+ };
+
+ renderHLSurface(debugData.keyboardFocusText, g_pSeatManager->state.keyboardFocus.lock(), Colors::PURPLE.modifyA(0.1F));
+ renderHLSurface(debugData.pointerFocusText, g_pSeatManager->state.pointerFocus.lock(), Colors::ORANGE.modifyA(0.1F));
+ if (g_pCompositor->m_pLastWindow)
+ renderHLSurface(debugData.lastWindowText, g_pCompositor->m_pLastWindow->m_pWLSurface->resource(), Colors::LIGHT_BLUE.modifyA(0.1F));
+}
+
float CRenderPass::oneBlurRadius() {
// TODO: is this exact range correct?
static auto PBLURSIZE = CConfigValue<Hyprlang::INT>("decoration:blur:size");
diff --git a/src/render/pass/Pass.hpp b/src/render/pass/Pass.hpp
index 6fe6938f..5d7d3bb3 100644
--- a/src/render/pass/Pass.hpp
+++ b/src/render/pass/Pass.hpp
@@ -4,6 +4,7 @@
#include "PassElement.hpp"
class CGradientValueData;
+class CTexture;
class CRenderPass {
public:
@@ -33,6 +34,12 @@ class CRenderPass {
void simplify();
float oneBlurRadius();
+ void renderDebugData();
+
+ struct {
+ bool present = false;
+ SP<CTexture> keyboardFocusText, pointerFocusText, lastWindowText;
+ } debugData;
friend class CHyprOpenGLImpl;
};
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-03 21:03:17 +0000