cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

syncobj: ensure we only add waiters on succesful checks (#9412)

Browse source 
timeline check only returns nullopt on ETIME_ERR , meaning the if check
later on returns true if drmSyncobjTimelineWait returns anything else
like EINVAL/EPERM/EACCESS etc, so actually check the returned .value()
of the std::optional. also move the fd to rvalue references.
This commit is contained in:
Tom Englund 2025-02-15 14:48:52 +01:00 • committed by GitHub
parent 2f967037aa
commit 3eb6cb1875
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/protocols/DRMSyncobj.cpp
View file

@ -75,7 +75,7 @@ CDRMSyncobjSurfaceResource::CDRMSyncobjSurfaceResource(SP<CWpLinuxDrmSyncobjSurf
return; return;
} }
if (materialized) if (materialized.value())
return; return;
surface->lockPendingState(); surface->lockPendingState();
@ -104,7 +104,7 @@ bool CDRMSyncobjSurfaceResource::good() {
return resource->resource(); return resource->resource();
} }
CDRMSyncobjTimelineResource::CDRMSyncobjTimelineResource(SP<CWpLinuxDrmSyncobjTimelineV1> resource_, CFileDescriptor fd_) : fd(std::move(fd_)), resource(resource_) { CDRMSyncobjTimelineResource::CDRMSyncobjTimelineResource(SP<CWpLinuxDrmSyncobjTimelineV1> resource_, CFileDescriptor&& fd_) : fd(std::move(fd_)), resource(resource_) {
if UNLIKELY (!good()) if UNLIKELY (!good())
return; return;

2
src/protocols/DRMSyncobj.hpp
View file

@ -33,7 +33,7 @@ class CDRMSyncobjSurfaceResource {
class CDRMSyncobjTimelineResource { class CDRMSyncobjTimelineResource {
public: public:
CDRMSyncobjTimelineResource(SP<CWpLinuxDrmSyncobjTimelineV1> resource_, Hyprutils::OS::CFileDescriptor fd_); CDRMSyncobjTimelineResource(SP<CWpLinuxDrmSyncobjTimelineV1> resource_, Hyprutils::OS::CFileDescriptor&& fd_);
~CDRMSyncobjTimelineResource() = default; ~CDRMSyncobjTimelineResource() = default;
static SP<CDRMSyncobjTimelineResource> fromResource(wl_resource*); static SP<CDRMSyncobjTimelineResource> fromResource(wl_resource*);