twin/hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-07-28 02:31:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

dmabuf: move to unique ptrs

Browse Source 
less refcounting, move by rvalue.
This commit is contained in:
Tom Englund
2025-07-10 13:07:44 +02:00
committed by Vaxry
parent 87653077f8
commit f22b5971d1
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/protocols/LinuxDMABUF.cpp
View File

@@ -120,7 +120,7 @@ bool CLinuxDMABuffer::good() {
return m_buffer && m_buffer->good(); return m_buffer && m_buffer->good();
} }
CLinuxDMABUFParamsResource::CLinuxDMABUFParamsResource(SP<CZwpLinuxBufferParamsV1> resource_) : m_resource(resource_) { CLinuxDMABUFParamsResource::CLinuxDMABUFParamsResource(UP<CZwpLinuxBufferParamsV1>&& resource_) : m_resource(std::move(resource_)) {
if UNLIKELY (!good()) if UNLIKELY (!good())
return; return;
@@ -215,7 +215,7 @@ void CLinuxDMABUFParamsResource::create(uint32_t id) {
LOGM(LOG, " | plane {}: mod {} fd {} stride {} offset {}", i, m_attrs->modifier, m_attrs->fds[i], m_attrs->strides[i], m_attrs->offsets[i]); LOGM(LOG, " | plane {}: mod {} fd {} stride {} offset {}", i, m_attrs->modifier, m_attrs->fds[i], m_attrs->strides[i], m_attrs->offsets[i]);
} }
auto buf = PROTO::linuxDma->m_buffers.emplace_back(makeShared<CLinuxDMABuffer>(id, m_resource->client(), *m_attrs)); auto& buf = PROTO::linuxDma->m_buffers.emplace_back(makeUnique<CLinuxDMABuffer>(id, m_resource->client(), *m_attrs));
if UNLIKELY (!buf->good() || !buf->m_buffer->m_success) { if UNLIKELY (!buf->good() || !buf->m_buffer->m_success) {
m_resource->sendFailed(); m_resource->sendFailed();
@@ -224,7 +224,7 @@ void CLinuxDMABUFParamsResource::create(uint32_t id) {
} }
if (!id) if (!id)
m_resource->sendCreated(PROTO::linuxDma->m_buffers.back()->m_buffer->m_resource->getResource()); m_resource->sendCreated(buf->m_buffer->m_resource->getResource());
m_createdBuffer = buf; m_createdBuffer = buf;
} }
@@ -291,7 +291,8 @@ bool CLinuxDMABUFParamsResource::verify() {
return true; return true;
} }
CLinuxDMABUFFeedbackResource::CLinuxDMABUFFeedbackResource(SP<CZwpLinuxDmabufFeedbackV1> resource_, SP<CWLSurfaceResource> surface_) : m_surface(surface_), m_resource(resource_) { CLinuxDMABUFFeedbackResource::CLinuxDMABUFFeedbackResource(UP<CZwpLinuxDmabufFeedbackV1>&& resource_, SP<CWLSurfaceResource> surface_) :
m_surface(surface_), m_resource(std::move(resource_)) {
if UNLIKELY (!good()) if UNLIKELY (!good())
return; return;
@@ -342,7 +343,7 @@ void CLinuxDMABUFFeedbackResource::sendDefaultFeedback() {
m_lastFeedbackWasScanout = false; m_lastFeedbackWasScanout = false;
} }
CLinuxDMABUFResource::CLinuxDMABUFResource(SP<CZwpLinuxDmabufV1> resource_) : m_resource(resource_) { CLinuxDMABUFResource::CLinuxDMABUFResource(UP<CZwpLinuxDmabufV1>&& resource_) : m_resource(std::move(resource_)) {
if UNLIKELY (!good()) if UNLIKELY (!good())
return; return;
@@ -350,8 +351,8 @@ CLinuxDMABUFResource::CLinuxDMABUFResource(SP<CZwpLinuxDmabufV1> resource_) : m_
m_resource->setDestroy([this](CZwpLinuxDmabufV1* r) { PROTO::linuxDma->destroyResource(this); }); m_resource->setDestroy([this](CZwpLinuxDmabufV1* r) { PROTO::linuxDma->destroyResource(this); });
m_resource->setGetDefaultFeedback([](CZwpLinuxDmabufV1* r, uint32_t id) { m_resource->setGetDefaultFeedback([](CZwpLinuxDmabufV1* r, uint32_t id) {
const auto RESOURCE = const auto& RESOURCE =
PROTO::linuxDma->m_feedbacks.emplace_back(makeShared<CLinuxDMABUFFeedbackResource>(makeShared<CZwpLinuxDmabufFeedbackV1>(r->client(), r->version(), id), nullptr)); PROTO::linuxDma->m_feedbacks.emplace_back(makeUnique<CLinuxDMABUFFeedbackResource>(makeUnique<CZwpLinuxDmabufFeedbackV1>(r->client(), r->version(), id), nullptr));
if UNLIKELY (!RESOURCE->good()) { if UNLIKELY (!RESOURCE->good()) {
r->noMemory(); r->noMemory();
@@ -361,8 +362,8 @@ CLinuxDMABUFResource::CLinuxDMABUFResource(SP<CZwpLinuxDmabufV1> resource_) : m_
}); });
m_resource->setGetSurfaceFeedback([](CZwpLinuxDmabufV1* r, uint32_t id, wl_resource* surf) { m_resource->setGetSurfaceFeedback([](CZwpLinuxDmabufV1* r, uint32_t id, wl_resource* surf) {
const auto RESOURCE = PROTO::linuxDma->m_feedbacks.emplace_back( const auto& RESOURCE = PROTO::linuxDma->m_feedbacks.emplace_back(
makeShared<CLinuxDMABUFFeedbackResource>(makeShared<CZwpLinuxDmabufFeedbackV1>(r->client(), r->version(), id), CWLSurfaceResource::fromResource(surf))); makeUnique<CLinuxDMABUFFeedbackResource>(makeUnique<CZwpLinuxDmabufFeedbackV1>(r->client(), r->version(), id), CWLSurfaceResource::fromResource(surf)));
if UNLIKELY (!RESOURCE->good()) { if UNLIKELY (!RESOURCE->good()) {
r->noMemory(); r->noMemory();
@@ -372,7 +373,7 @@ CLinuxDMABUFResource::CLinuxDMABUFResource(SP<CZwpLinuxDmabufV1> resource_) : m_
}); });
m_resource->setCreateParams([](CZwpLinuxDmabufV1* r, uint32_t id) { m_resource->setCreateParams([](CZwpLinuxDmabufV1* r, uint32_t id) {
const auto RESOURCE = PROTO::linuxDma->m_params.emplace_back(makeShared<CLinuxDMABUFParamsResource>(makeShared<CZwpLinuxBufferParamsV1>(r->client(), r->version(), id))); const auto& RESOURCE = PROTO::linuxDma->m_params.emplace_back(makeUnique<CLinuxDMABUFParamsResource>(makeUnique<CZwpLinuxBufferParamsV1>(r->client(), r->version(), id)));
if UNLIKELY (!RESOURCE->good()) { if UNLIKELY (!RESOURCE->good()) {
r->noMemory(); r->noMemory();
@@ -516,7 +517,7 @@ void CLinuxDMABufV1Protocol::resetFormatTable() {
} }
void CLinuxDMABufV1Protocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) { void CLinuxDMABufV1Protocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) {
const auto RESOURCE = m_managers.emplace_back(makeShared<CLinuxDMABUFResource>(makeShared<CZwpLinuxDmabufV1>(client, ver, id))); const auto& RESOURCE = m_managers.emplace_back(makeUnique<CLinuxDMABUFResource>(makeUnique<CZwpLinuxDmabufV1>(client, ver, id)));
if UNLIKELY (!RESOURCE->good()) { if UNLIKELY (!RESOURCE->good()) {
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
@@ -542,7 +543,7 @@ void CLinuxDMABufV1Protocol::destroyResource(CLinuxDMABuffer* resource) {
} }
void CLinuxDMABufV1Protocol::updateScanoutTranche(SP<CWLSurfaceResource> surface, PHLMONITOR pMonitor) { void CLinuxDMABufV1Protocol::updateScanoutTranche(SP<CWLSurfaceResource> surface, PHLMONITOR pMonitor) {
SP<CLinuxDMABUFFeedbackResource> feedbackResource; WP<CLinuxDMABUFFeedbackResource> feedbackResource;
for (auto const& f : m_feedbacks) { for (auto const& f : m_feedbacks) {
if (f->m_surface != surface) if (f->m_surface != surface)
continue; continue;

20
src/protocols/LinuxDMABUF.hpp
View File

@@ -59,7 +59,7 @@ class CDMABUFFormatTable {
class CLinuxDMABUFParamsResource { class CLinuxDMABUFParamsResource {
public: public:
CLinuxDMABUFParamsResource(SP<CZwpLinuxBufferParamsV1> resource_); CLinuxDMABUFParamsResource(UP<CZwpLinuxBufferParamsV1>&& resource_);
~CLinuxDMABUFParamsResource() = default; ~CLinuxDMABUFParamsResource() = default;
bool good(); bool good();
@@ -70,7 +70,7 @@ class CLinuxDMABUFParamsResource {
bool m_used = false; bool m_used = false;
private: private:
SP<CZwpLinuxBufferParamsV1> m_resource; UP<CZwpLinuxBufferParamsV1> m_resource;
bool verify(); bool verify();
bool commence(); bool commence();
@@ -78,7 +78,7 @@ class CLinuxDMABUFParamsResource {
class CLinuxDMABUFFeedbackResource { class CLinuxDMABUFFeedbackResource {
public: public:
CLinuxDMABUFFeedbackResource(SP<CZwpLinuxDmabufFeedbackV1> resource_, SP<CWLSurfaceResource> surface_); CLinuxDMABUFFeedbackResource(UP<CZwpLinuxDmabufFeedbackV1>&& resource_, SP<CWLSurfaceResource> surface_);
~CLinuxDMABUFFeedbackResource() = default; ~CLinuxDMABUFFeedbackResource() = default;
bool good(); bool good();
@@ -88,7 +88,7 @@ class CLinuxDMABUFFeedbackResource {
SP<CWLSurfaceResource> m_surface; // optional, for surface feedbacks SP<CWLSurfaceResource> m_surface; // optional, for surface feedbacks
private: private:
SP<CZwpLinuxDmabufFeedbackV1> m_resource; UP<CZwpLinuxDmabufFeedbackV1> m_resource;
bool m_lastFeedbackWasScanout = false; bool m_lastFeedbackWasScanout = false;
friend class CLinuxDMABufV1Protocol; friend class CLinuxDMABufV1Protocol;
@@ -96,14 +96,14 @@ class CLinuxDMABUFFeedbackResource {
class CLinuxDMABUFResource { class CLinuxDMABUFResource {
public: public:
CLinuxDMABUFResource(SP<CZwpLinuxDmabufV1> resource_); CLinuxDMABUFResource(UP<CZwpLinuxDmabufV1>&& resource_);
~CLinuxDMABUFResource() = default; ~CLinuxDMABUFResource() = default;
bool good(); bool good();
void sendMods(); void sendMods();
private: private:
SP<CZwpLinuxDmabufV1> m_resource; UP<CZwpLinuxDmabufV1> m_resource;
}; };
class CLinuxDMABufV1Protocol : public IWaylandProtocol { class CLinuxDMABufV1Protocol : public IWaylandProtocol {
@@ -123,10 +123,10 @@ class CLinuxDMABufV1Protocol : public IWaylandProtocol {
void resetFormatTable(); void resetFormatTable();
// //
std::vector<SP<CLinuxDMABUFResource>> m_managers; std::vector<UP<CLinuxDMABUFResource>> m_managers;
std::vector<SP<CLinuxDMABUFFeedbackResource>> m_feedbacks; std::vector<UP<CLinuxDMABUFFeedbackResource>> m_feedbacks;
std::vector<SP<CLinuxDMABUFParamsResource>> m_params; std::vector<UP<CLinuxDMABUFParamsResource>> m_params;
std::vector<SP<CLinuxDMABuffer>> m_buffers; std::vector<UP<CLinuxDMABuffer>> m_buffers;
UP<CDMABUFFormatTable> m_formatTable; UP<CDMABUFFormatTable> m_formatTable;
dev_t m_mainDevice; dev_t m_mainDevice;