diff options
| author | Tom Englund <tomenglund26@gmail.com> | 2025-03-26 02:22:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-26 02:22:09 +0100 |
| commit | 3fc3521a97eba0fa67da80f17ae7872b1073f08d (patch) | |
| tree | 74b52fe24261ca32cbf60e8f99f5b29a312ee765 /src | |
| parent | 9a67354fa24b66dc35f2c702be085122d110c38a (diff) | |
pass: remove unusued timeline in texpass (#9734)
remove unused timeline and waitpoint in texpass and especially remove
the passing it to renderTextureInternalWithDamage that implicitly
converted it to bool. setting discardActive and allowCustomUV
Diffstat (limited to 'src')
| -rw-r--r-- | src/managers/PointerManager.cpp | 10 | ||||
| -rw-r--r-- | src/managers/PointerManager.hpp | 2 | ||||
| -rw-r--r-- | src/render/pass/TexPassElement.cpp | 3 | ||||
| -rw-r--r-- | src/render/pass/TexPassElement.hpp | 2 |
4 files changed, 4 insertions, 13 deletions
diff --git a/src/managers/PointerManager.cpp b/src/managers/PointerManager.cpp index e4f24230..89be4e99 100644 --- a/src/managers/PointerManager.cpp +++ b/src/managers/PointerManager.cpp @@ -621,14 +621,10 @@ void CPointerManager::renderSoftwareCursorsFor(PHLMONITOR pMonitor, timespec* no box.y = std::round(box.y); CTexPassElement::SRenderData data; - data.tex = texture; - data.box = box.round(); - data.syncTimeline = currentCursorImage.waitTimeline; - data.syncPoint = currentCursorImage.waitPoint; - g_pHyprRenderer->m_sRenderPass.add(makeShared<CTexPassElement>(data)); + data.tex = texture; + data.box = box.round(); - currentCursorImage.waitTimeline.reset(); - currentCursorImage.waitPoint = 0; + g_pHyprRenderer->m_sRenderPass.add(makeShared<CTexPassElement>(data)); if (currentCursorImage.surface) currentCursorImage.surface->resource()->frame(now); diff --git a/src/managers/PointerManager.hpp b/src/managers/PointerManager.hpp index d00b55ba..4bdd309c 100644 --- a/src/managers/PointerManager.hpp +++ b/src/managers/PointerManager.hpp @@ -148,8 +148,6 @@ class CPointerManager { CHyprSignalListener destroySurface; CHyprSignalListener commitSurface; - SP<CSyncTimeline> waitTimeline = nullptr; - uint64_t waitPoint = 0; } currentCursorImage; // TODO: support various sizes per-output so we can have pixel-perfect cursors Vector2D pointerPos = {0, 0}; diff --git a/src/render/pass/TexPassElement.cpp b/src/render/pass/TexPassElement.cpp index 8b577373..01302907 100644 --- a/src/render/pass/TexPassElement.cpp +++ b/src/render/pass/TexPassElement.cpp @@ -22,8 +22,7 @@ void CTexPassElement::draw(const CRegion& damage) { if (data.replaceProjection) g_pHyprOpenGL->m_RenderData.monitorProjection = *data.replaceProjection; - g_pHyprOpenGL->renderTextureInternalWithDamage(data.tex, data.box, data.a, data.damage.empty() ? damage : data.damage, data.round, data.roundingPower, data.syncTimeline, - data.syncPoint); + g_pHyprOpenGL->renderTextureInternalWithDamage(data.tex, data.box, data.a, data.damage.empty() ? damage : data.damage, data.round, data.roundingPower); if (data.replaceProjection) g_pHyprOpenGL->m_RenderData.monitorProjection = g_pHyprOpenGL->m_RenderData.pMonitor->projMatrix; } diff --git a/src/render/pass/TexPassElement.hpp b/src/render/pass/TexPassElement.hpp index 6faa0872..5f0f490f 100644 --- a/src/render/pass/TexPassElement.hpp +++ b/src/render/pass/TexPassElement.hpp @@ -16,8 +16,6 @@ class CTexPassElement : public IPassElement { int round = 0; float roundingPower = 2.0f; bool flipEndFrame = false; - SP<CSyncTimeline> syncTimeline; - int64_t syncPoint = 0; std::optional<Mat3x3> replaceProjection; CBox clipBox; }; |
