diff options
| author | zacoons <73414084+zacoons@users.noreply.github.com> | 2025-06-22 03:03:28 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-21 19:03:28 +0200 |
| commit | 8b1d5560cf1ca2c4c2624914de284d315502a092 (patch) | |
| tree | 5a056cb66c14b9e8a9004586daf93f02d764ea25 /src/render | |
| parent | 238887473866a63c0fd70ead614f37ac86333e28 (diff) | |
renderer: add wrapping options to renderTextureWithBlur method (#10807)
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/OpenGL.cpp | 11 | ||||
| -rw-r--r-- | src/render/OpenGL.hpp | 3 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp index a253e3ff..30680497 100644 --- a/src/render/OpenGL.cpp +++ b/src/render/OpenGL.cpp @@ -2133,7 +2133,7 @@ bool CHyprOpenGLImpl::shouldUseNewBlurOptimizations(PHLLS pLayer, PHLWINDOW pWin } void CHyprOpenGLImpl::renderTextureWithBlur(SP<CTexture> tex, const CBox& box, float a, SP<CWLSurfaceResource> pSurface, int round, float roundingPower, bool blockBlurOptimization, - float blurA, float overallA) { + float blurA, float overallA, GLenum wrapX, GLenum wrapY) { RASSERT(m_renderData.pMonitor, "Tried to render texture with blur without begin()!"); TRACY_GPU_ZONE("RenderTextureWithBlur"); @@ -2161,7 +2161,7 @@ void CHyprOpenGLImpl::renderTextureWithBlur(SP<CTexture> tex, const CBox& box, f inverseOpaque.invert(&surfbox).intersect(0, 0, pSurface->m_current.size.x * pSurface->m_current.scale, pSurface->m_current.size.y * pSurface->m_current.scale); if (inverseOpaque.empty()) { - renderTexture(tex, box, a, round, roundingPower, false, true); + renderTexture(tex, box, a, round, roundingPower, false, true, wrapX, wrapY); return; } } else @@ -2197,7 +2197,7 @@ void CHyprOpenGLImpl::renderTextureWithBlur(SP<CTexture> tex, const CBox& box, f if (USENEWOPTIMIZE && !(m_renderData.discardMode & DISCARD_ALPHA)) renderRect(box, CHyprColor(0, 0, 0, 0), round, roundingPower); else - renderTexture(tex, box, a, round, roundingPower, true, true); // discard opaque + renderTexture(tex, box, a, round, roundingPower, true, true, wrapX, wrapY); // discard opaque glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); glStencilFunc(GL_EQUAL, 1, 0xFF); @@ -2223,7 +2223,8 @@ void CHyprOpenGLImpl::renderTextureWithBlur(SP<CTexture> tex, const CBox& box, f pushMonitorTransformEnabled(true); if (!USENEWOPTIMIZE) setRenderModifEnabled(false); - renderTextureInternalWithDamage(POUTFB->getTexture(), box, (*PBLURIGNOREOPACITY ? blurA : a * blurA) * overallA, texDamage, round, roundingPower, false, false, true); + renderTextureInternalWithDamage(POUTFB->getTexture(), box, (*PBLURIGNOREOPACITY ? blurA : a * blurA) * overallA, texDamage, round, roundingPower, false, false, true, wrapX, + wrapY); if (!USENEWOPTIMIZE) setRenderModifEnabled(true); popMonitorTransformEnabled(); @@ -2237,7 +2238,7 @@ void CHyprOpenGLImpl::renderTextureWithBlur(SP<CTexture> tex, const CBox& box, f // draw window glDisable(GL_STENCIL_TEST); - renderTextureInternalWithDamage(tex, box, a * overallA, texDamage, round, roundingPower, false, false, true, true); + renderTextureInternalWithDamage(tex, box, a * overallA, texDamage, round, roundingPower, false, false, true, true, wrapX, wrapY); glStencilMask(0xFF); glStencilFunc(GL_ALWAYS, 1, 0xFF); diff --git a/src/render/OpenGL.hpp b/src/render/OpenGL.hpp index fc091f36..eeea2b24 100644 --- a/src/render/OpenGL.hpp +++ b/src/render/OpenGL.hpp @@ -7,6 +7,7 @@ #include "../helpers/math/Math.hpp" #include "../helpers/Format.hpp" #include "../helpers/sync/SyncTimeline.hpp" +#include <GLES3/gl32.h> #include <cstdint> #include <list> #include <string> @@ -189,7 +190,7 @@ class CHyprOpenGLImpl { void renderTextureWithDamage(SP<CTexture>, const CBox&, const CRegion& damage, float a, int round = 0, float roundingPower = 2.0f, bool discardActive = false, bool allowCustomUV = false); void renderTextureWithBlur(SP<CTexture>, const CBox&, float a, SP<CWLSurfaceResource> pSurface, int round = 0, float roundingPower = 2.0f, bool blockBlurOptimization = false, - float blurA = 1.f, float overallA = 1.f); + float blurA = 1.f, float overallA = 1.f, GLenum wrapX = GL_CLAMP_TO_EDGE, GLenum wrapY = GL_CLAMP_TO_EDGE); void renderRoundedShadow(const CBox&, int round, float roundingPower, int range, const CHyprColor& color, float a = 1.0); void renderBorder(const CBox&, const CGradientValueData&, int round, float roundingPower, int borderSize, float a = 1.0, int outerRound = -1 /* use round */); void renderBorder(const CBox&, const CGradientValueData&, const CGradientValueData&, float lerp, int round, float roundingPower, int borderSize, float a = 1.0, |
