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

singlepixel: move to unique ptrs

Browse source 
less refcounting, move by rvalue.
This commit is contained in:
Tom Englund 2025-07-10 13:11:07 +02:00 • committed by Vaxry
parent bcb96c5532
commit b5433bb753
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/protocols/SinglePixel.cpp
View file

@ -79,7 +79,7 @@ bool CSinglePixelBufferResource::good() {
return m_buffer->good(); return m_buffer->good();
} }
CSinglePixelBufferManagerResource::CSinglePixelBufferManagerResource(SP<CWpSinglePixelBufferManagerV1> resource_) : m_resource(resource_) { CSinglePixelBufferManagerResource::CSinglePixelBufferManagerResource(UP<CWpSinglePixelBufferManagerV1>&& resource_) : m_resource(std::move(resource_)) {
if UNLIKELY (!good()) if UNLIKELY (!good())
return; return;
@ -87,9 +87,9 @@ CSinglePixelBufferManagerResource::CSinglePixelBufferManagerResource(SP<CWpSingl
m_resource->setOnDestroy([this](CWpSinglePixelBufferManagerV1* r) { PROTO::singlePixel->destroyResource(this); }); m_resource->setOnDestroy([this](CWpSinglePixelBufferManagerV1* r) { PROTO::singlePixel->destroyResource(this); });
m_resource->setCreateU32RgbaBuffer([this](CWpSinglePixelBufferManagerV1* res, uint32_t id, uint32_t r, uint32_t g, uint32_t b, uint32_t a) { m_resource->setCreateU32RgbaBuffer([this](CWpSinglePixelBufferManagerV1* res, uint32_t id, uint32_t r, uint32_t g, uint32_t b, uint32_t a) {
CHyprColor color{r / (float)std::numeric_limits<uint32_t>::max(), g / (float)std::numeric_limits<uint32_t>::max(), b / (float)std::numeric_limits<uint32_t>::max(), CHyprColor color{r / (float)std::numeric_limits<uint32_t>::max(), g / (float)std::numeric_limits<uint32_t>::max(), b / (float)std::numeric_limits<uint32_t>::max(),
a / (float)std::numeric_limits<uint32_t>::max()}; a / (float)std::numeric_limits<uint32_t>::max()};
const auto RESOURCE = PROTO::singlePixel->m_buffers.emplace_back(makeShared<CSinglePixelBufferResource>(id, m_resource->client(), color)); const auto& RESOURCE = PROTO::singlePixel->m_buffers.emplace_back(makeUnique<CSinglePixelBufferResource>(id, m_resource->client(), color));
if UNLIKELY (!RESOURCE->good()) { if UNLIKELY (!RESOURCE->good()) {
res->noMemory(); res->noMemory();
@ -108,7 +108,7 @@ CSinglePixelProtocol::CSinglePixelProtocol(const wl_interface* iface, const int&
} }
void CSinglePixelProtocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) { void CSinglePixelProtocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) {
const auto RESOURCE = m_managers.emplace_back(makeShared<CSinglePixelBufferManagerResource>(makeShared<CWpSinglePixelBufferManagerV1>(client, ver, id))); const auto& RESOURCE = m_managers.emplace_back(makeUnique<CSinglePixelBufferManagerResource>(makeUnique<CWpSinglePixelBufferManagerV1>(client, ver, id)));
if UNLIKELY (!RESOURCE->good()) { if UNLIKELY (!RESOURCE->good()) {
wl_client_post_no_memory(client); wl_client_post_no_memory(client);

8
src/protocols/SinglePixel.hpp
View file

@ -43,12 +43,12 @@ class CSinglePixelBufferResource {
class CSinglePixelBufferManagerResource { class CSinglePixelBufferManagerResource {
public: public:
CSinglePixelBufferManagerResource(SP<CWpSinglePixelBufferManagerV1> resource_); CSinglePixelBufferManagerResource(UP<CWpSinglePixelBufferManagerV1>&& resource_);
bool good(); bool good();
private: private:
SP<CWpSinglePixelBufferManagerV1> m_resource; UP<CWpSinglePixelBufferManagerV1> m_resource;
}; };
class CSinglePixelProtocol : public IWaylandProtocol { class CSinglePixelProtocol : public IWaylandProtocol {
@ -62,8 +62,8 @@ class CSinglePixelProtocol : public IWaylandProtocol {
void destroyResource(CSinglePixelBufferResource* resource); void destroyResource(CSinglePixelBufferResource* resource);
// //
std::vector<SP<CSinglePixelBufferManagerResource>> m_managers; std::vector<UP<CSinglePixelBufferManagerResource>> m_managers;
std::vector<SP<CSinglePixelBufferResource>> m_buffers; std::vector<UP<CSinglePixelBufferResource>> m_buffers;
friend class CSinglePixelBufferManagerResource; friend class CSinglePixelBufferManagerResource;
friend class CSinglePixelBufferResource; friend class CSinglePixelBufferResource;