hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-17 03:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

presentation-feedback: minor fixups

Browse source
This commit is contained in:
Vaxry 2024-08-30 15:50:25 +02:00
parent fd8d8e122e
commit fbd6354393
6 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/helpers/Monitor.cpp
View file

@ -47,7 +47,7 @@ void CMonitor::onConnect(bool noRule) {
listeners.presented = output->events.present.registerListener([this](std::any d) { listeners.presented = output->events.present.registerListener([this](std::any d) {
auto E = std::any_cast<Aquamarine::IOutput::SPresentEvent>(d); auto E = std::any_cast<Aquamarine::IOutput::SPresentEvent>(d);
PROTO::presentation->onPresented(this, E.when, E.refresh, E.seq, E.flags); PROTO::presentation->onPresented(self.lock(), E.when, E.refresh, E.seq, E.flags);
}); });
listeners.destroy = output->events.destroy.registerListener([this](std::any d) { listeners.destroy = output->events.destroy.registerListener([this](std::any d) {
@ -861,7 +861,7 @@ bool CMonitor::attemptDirectScanout() {
timespec now; timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
PSURFACE->presentFeedback(&now, this); PSURFACE->presentFeedback(&now, self.lock());
output->state->addDamage(CBox{{}, vecPixelSize}); output->state->addDamage(CBox{{}, vecPixelSize});
output->state->resetExplicitFences(); output->state->resetExplicitFences();

12
src/protocols/PresentationTime.cpp
View file

@ -14,7 +14,7 @@ void CQueuedPresentationData::setPresentationType(bool zeroCopy_) {
zeroCopy = zeroCopy_; zeroCopy = zeroCopy_;
} }
void CQueuedPresentationData::attachMonitor(CMonitor* pMonitor_) { void CQueuedPresentationData::attachMonitor(SP<CMonitor> pMonitor_) {
pMonitor = pMonitor_; pMonitor = pMonitor_;
} }
@ -67,12 +67,14 @@ void CPresentationFeedback::sendQueued(SP<CQueuedPresentationData> data, timespe
(uint32_t)(seq & 0xFFFFFFFF), (wpPresentationFeedbackKind)flags); (uint32_t)(seq & 0xFFFFFFFF), (wpPresentationFeedbackKind)flags);
else else
resource->sendDiscarded(); resource->sendDiscarded();
done = true;
} }
CPresentationProtocol::CPresentationProtocol(const wl_interface* iface, const int& ver, const std::string& name) : IWaylandProtocol(iface, ver, name) { CPresentationProtocol::CPresentationProtocol(const wl_interface* iface, const int& ver, const std::string& name) : IWaylandProtocol(iface, ver, name) {
static auto P = g_pHookSystem->hookDynamic("monitorRemoved", [this](void* self, SCallbackInfo& info, std::any param) { static auto P = g_pHookSystem->hookDynamic("monitorRemoved", [this](void* self, SCallbackInfo& info, std::any param) {
const auto PMONITOR = std::any_cast<CMonitor*>(param); const auto PMONITOR = std::any_cast<CMonitor*>(param);
std::erase_if(m_vQueue, [PMONITOR](const auto& other) { return !other->surface || other->pMonitor == PMONITOR; }); std::erase_if(m_vQueue, [PMONITOR](const auto& other) { return !other->surface || other->pMonitor.get() == PMONITOR; });
}); });
} }
@ -105,7 +107,7 @@ void CPresentationProtocol::onGetFeedback(CWpPresentation* pMgr, wl_resource* su
} }
} }
void CPresentationProtocol::onPresented(CMonitor* pMonitor, timespec* when, uint32_t untilRefreshNs, uint64_t seq, uint32_t reportedFlags) { void CPresentationProtocol::onPresented(SP<CMonitor> pMonitor, timespec* when, uint32_t untilRefreshNs, uint64_t seq, uint32_t reportedFlags) {
timespec now; timespec now;
timespec* presentedAt = when; timespec* presentedAt = when;
if (!presentedAt) { if (!presentedAt) {
@ -119,7 +121,7 @@ void CPresentationProtocol::onPresented(CMonitor* pMonitor, timespec* when, uint
continue; continue;
for (auto const& data : m_vQueue) { for (auto const& data : m_vQueue) {
if (!data->surface || data->surface != feedback->surface) if (!data->surface || data->surface != feedback->surface || (data->pMonitor && data->pMonitor != pMonitor))
continue; continue;
feedback->sendQueued(data, when, untilRefreshNs, seq, reportedFlags); feedback->sendQueued(data, when, untilRefreshNs, seq, reportedFlags);
@ -129,7 +131,7 @@ void CPresentationProtocol::onPresented(CMonitor* pMonitor, timespec* when, uint
} }
std::erase_if(m_vFeedbacks, [](const auto& other) { return !other->surface || other->done; }); std::erase_if(m_vFeedbacks, [](const auto& other) { return !other->surface || other->done; });
std::erase_if(m_vQueue, [pMonitor](const auto& other) { return !other->surface || other->pMonitor == pMonitor || !other->pMonitor; }); std::erase_if(m_vQueue, [pMonitor](const auto& other) { return !other->surface || other->pMonitor == pMonitor || !other->pMonitor || other->done; });
} }
void CPresentationProtocol::queueData(SP<CQueuedPresentationData> data) { void CPresentationProtocol::queueData(SP<CQueuedPresentationData> data) {

8
src/protocols/PresentationTime.hpp
View file

@ -14,15 +14,17 @@ class CQueuedPresentationData {
CQueuedPresentationData(SP<CWLSurfaceResource> surf); CQueuedPresentationData(SP<CWLSurfaceResource> surf);
void setPresentationType(bool zeroCopy); void setPresentationType(bool zeroCopy);
void attachMonitor(CMonitor* pMonitor); void attachMonitor(SP<CMonitor> pMonitor);
void presented(); void presented();
void discarded(); void discarded();
bool done = false;
private: private:
bool wasPresented = false; bool wasPresented = false;
bool zeroCopy = false; bool zeroCopy = false;
CMonitor* pMonitor = nullptr; WP<CMonitor> pMonitor;
WP<CWLSurfaceResource> surface; WP<CWLSurfaceResource> surface;
DYNLISTENER(destroySurface); DYNLISTENER(destroySurface);
@ -53,7 +55,7 @@ class CPresentationProtocol : public IWaylandProtocol {
virtual void bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id); virtual void bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id);
void onPresented(CMonitor* pMonitor, timespec* when, uint32_t untilRefreshNs, uint64_t seq, uint32_t reportedFlags); void onPresented(SP<CMonitor> pMonitor, timespec* when, uint32_t untilRefreshNs, uint64_t seq, uint32_t reportedFlags);
void queueData(SP<CQueuedPresentationData> data); void queueData(SP<CQueuedPresentationData> data);
private: private:

2
src/protocols/core/Compositor.cpp
View file

@ -509,7 +509,7 @@ void CWLSurfaceResource::updateCursorShm() {
memcpy(shmData.data(), pixelData, bufLen); memcpy(shmData.data(), pixelData, bufLen);
} }
void CWLSurfaceResource::presentFeedback(timespec* when, CMonitor* pMonitor) { void CWLSurfaceResource::presentFeedback(timespec* when, SP<CMonitor> pMonitor) {
frame(when); frame(when);
auto FEEDBACK = makeShared<CQueuedPresentationData>(self.lock()); auto FEEDBACK = makeShared<CQueuedPresentationData>(self.lock());
FEEDBACK->attachMonitor(pMonitor); FEEDBACK->attachMonitor(pMonitor);

2
src/protocols/core/Compositor.hpp
View file

@ -124,7 +124,7 @@ class CWLSurfaceResource {
void breadthfirst(std::function<void(SP<CWLSurfaceResource>, const Vector2D&, void*)> fn, void* data); void breadthfirst(std::function<void(SP<CWLSurfaceResource>, const Vector2D&, void*)> fn, void* data);
CRegion accumulateCurrentBufferDamage(); CRegion accumulateCurrentBufferDamage();
void presentFeedback(timespec* when, CMonitor* pMonitor); void presentFeedback(timespec* when, SP<CMonitor> pMonitor);
void lockPendingState(); void lockPendingState();
void unlockPendingState(); void unlockPendingState();

4
src/render/Renderer.cpp
View file

@ -185,7 +185,7 @@ static void renderSurface(SP<CWLSurfaceResource> surface, int x, int y, void* da
if (windowBox.width <= 1 || windowBox.height <= 1) { if (windowBox.width <= 1 || windowBox.height <= 1) {
if (!g_pHyprRenderer->m_bBlockSurfaceFeedback) { if (!g_pHyprRenderer->m_bBlockSurfaceFeedback) {
Debug::log(TRACE, "presentFeedback for invisible surface"); Debug::log(TRACE, "presentFeedback for invisible surface");
surface->presentFeedback(RDATA->when, RDATA->pMonitor); surface->presentFeedback(RDATA->when, RDATA->pMonitor->self.lock());
} }
return; // invisible return; // invisible
@ -240,7 +240,7 @@ static void renderSurface(SP<CWLSurfaceResource> surface, int x, int y, void* da
} }
if (!g_pHyprRenderer->m_bBlockSurfaceFeedback) if (!g_pHyprRenderer->m_bBlockSurfaceFeedback)
surface->presentFeedback(RDATA->when, RDATA->pMonitor); surface->presentFeedback(RDATA->when, RDATA->pMonitor->self.lock());
g_pHyprOpenGL->blend(true); g_pHyprOpenGL->blend(true);