virt/hypr-dynamic-cursors
1
1
Fork 0
mirror of https://github.com/virtcode/hypr-dynamic-cursors synced 2025-09-19 16:13:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix: buffer fixes for dumbcopy

Browse source 
see 37e1411e8d
fix #17
This commit is contained in:
Virt 2024-08-01 22:08:59 +02:00
commit ed2ff68862
1 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/cursor.cpp
View file

@ -18,6 +18,7 @@
#include <hyprland/src/config/ConfigValue.hpp> #include <hyprland/src/config/ConfigValue.hpp>
#include <hyprland/src/protocols/core/Compositor.hpp> #include <hyprland/src/protocols/core/Compositor.hpp>
#include <hyprland/src/protocols/core/Seat.hpp>
#include "cursor.hpp" #include "cursor.hpp"
#include "renderer.hpp" #include "renderer.hpp"
@ -211,16 +212,39 @@ SP<Aquamarine::IBuffer> CDynamicCursors::renderHardware(CPointerManager* pointer
// clear buffer // clear buffer
memset(bufPtr, 0, std::get<2>(bufData)); memset(bufPtr, 0, std::get<2>(bufData));
auto texBuffer = pointers->currentCursorImage.pBuffer ? pointers->currentCursorImage.pBuffer : pointers->currentCursorImage.surface->resource()->current.buffer; if (pointers->currentCursorImage.pBuffer) {
auto texAttrs = pointers->currentCursorImage.pBuffer->shm();
if (texBuffer) { if (!texAttrs.success) {
auto textAttrs = texBuffer->shm(); Debug::log(TRACE, "Cannot use dumb copy on dmabuf cursor buffers");
auto texData = texBuffer->beginDataPtr(GBM_BO_TRANSFER_WRITE); return nullptr;
auto texPtr = std::get<0>(texData); }
Debug::log(TRACE, "cursor texture {}x{} {} {} {}", textAttrs.size.x, textAttrs.size.y, (void*)texPtr, textAttrs.format, textAttrs.stride);
auto texData = pointers->currentCursorImage.pBuffer->beginDataPtr(GBM_BO_TRANSFER_WRITE);
auto texPtr = std::get<0>(texData);
Debug::log(TRACE, "cursor texture {}x{} {} {} {}", texAttrs.size.x, texAttrs.size.y, (void*)texPtr, texAttrs.format, texAttrs.stride);
// copy cursor texture // copy cursor texture
for (int i = 0; i < texBuffer->shm().size.y; i++) for (int i = 0; i < texAttrs.size.y; i++)
memcpy(bufPtr + i * buf->dmabuf().strides[0], texPtr + i * textAttrs.stride, textAttrs.stride); memcpy(bufPtr + i * buf->dmabuf().strides[0], texPtr + i * texAttrs.stride, texAttrs.stride);
} else if (pointers->currentCursorImage.surface && pointers->currentCursorImage.surface->resource()->role->role() == SURFACE_ROLE_CURSOR) {
const auto SURFACE = pointers->currentCursorImage.surface->resource();
auto& shmBuffer = CCursorSurfaceRole::cursorPixelData(SURFACE);
Debug::log(TRACE, "cursor texture pixel data length: {}B", shmBuffer.size());
if (shmBuffer.data()) {
// copy cursor texture
// assume format is 32bpp
size_t STRIDE = 4 * SURFACE->current.bufferSize.x;
for (int i = 0; i < SURFACE->current.bufferSize.y; i++)
memcpy(bufPtr + i * buf->dmabuf().strides[0], shmBuffer.data() + i * STRIDE, STRIDE);
} else {
// if there is no data, hide the cursor
memset(bufPtr, '\0', buf->size.x * buf->size.y * 4 /* assume 32bpp */);
}
} else {
Debug::log(TRACE, "Unsupported cursor buffer/surface, falling back to sw (can't dumb copy)");
return nullptr;
} }
buf->endDataPtr(); buf->endDataPtr();