From bb05b4ebcdd8ae953fa46b9ade4294ed557ba55c Mon Sep 17 00:00:00 2001 From: Vaxry Date: Sun, 13 Oct 2024 00:45:29 +0100 Subject: [PATCH] initial work --- include/aquamarine/output/Output.hpp | 29 ++++++++++++++++ src/output/Output.cpp | 49 ++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/include/aquamarine/output/Output.hpp b/include/aquamarine/output/Output.hpp index 9b0519f..8d983d5 100644 --- a/include/aquamarine/output/Output.hpp +++ b/include/aquamarine/output/Output.hpp @@ -53,6 +53,16 @@ namespace Aquamarine { AQ_OUTPUT_STATE_EXPLICIT_IN_FENCE = (1 << 8), AQ_OUTPUT_STATE_EXPLICIT_OUT_FENCE = (1 << 9), AQ_OUTPUT_STATE_CTM = (1 << 10), + AQ_OUTPUT_STATE_PLANE_STATE = (1 << 11), + }; + + struct SPlaneState { + bool updated = false; + + bool enabled = false; + Hyprutils::Math::CRegion damage; + Hyprutils::Math::CBox geometry; + Hyprutils::Memory::CSharedPointer buffer; }; struct SInternalState { @@ -70,6 +80,7 @@ namespace Aquamarine { Hyprutils::Memory::CSharedPointer buffer; int64_t explicitInFence = -1, explicitOutFence = -1; Hyprutils::Math::Mat3x3 ctm; + std::vector planeStates; }; const SInternalState& state(); @@ -88,6 +99,11 @@ namespace Aquamarine { void setExplicitOutFence(int64_t fenceFD); // -1 removes void resetExplicitFences(); void setCTM(const Hyprutils::Math::Mat3x3& ctm); + + void setPlaneEnabled(uint32_t planeIdx, bool enabled); + void setPlaneBuffer(uint32_t planeIdx, Hyprutils::Memory::CSharedPointer buffer); + void setPlaneGeometry(uint32_t planeIdx, const Hyprutils::Math::CBox& box); + void addPlaneDamage(uint32_t planeIdx, const Hyprutils::Math::CRegion& region); private: SInternalState internalState; @@ -119,6 +135,18 @@ namespace Aquamarine { AQ_SCHEDULE_ANIMATION_DAMAGE, }; + enum planeType : uint32_t { + AQ_PLANE_UNKNOWN = 0, + AQ_PLANE_PRIMARY, + AQ_PLANE_GENERIC, + AQ_PLANE_CURSOR, + }; + + struct SPlaneData { + std::vector renderFormats; // empty if unknown / not specified -> use getRenderFormats() + planeType type = AQ_PLANE_UNKNOWN; + }; + virtual bool commit() = 0; virtual bool test() = 0; virtual Hyprutils::Memory::CSharedPointer getBackend() = 0; @@ -131,6 +159,7 @@ namespace Aquamarine { virtual void scheduleFrame(const scheduleFrameReason reason = AQ_SCHEDULE_UNKNOWN); virtual size_t getGammaSize(); virtual bool destroy(); // not all backends allow this!!! + virtual std::vector getPlanes(); std::string name, description, make, model, serial; Hyprutils::Math::Vector2D physicalSize; diff --git a/src/output/Output.cpp b/src/output/Output.cpp index b5d3f3e..3f0ab6d 100644 --- a/src/output/Output.cpp +++ b/src/output/Output.cpp @@ -43,6 +43,10 @@ bool Aquamarine::IOutput::destroy() { return false; } +std::vector Aquamarine::IOutput::getPlanes() { + return {{.renderFormats = {}, .type = AQ_PLANE_PRIMARY}}; +} + const Aquamarine::COutputState::SInternalState& Aquamarine::COutputState::state() { return internalState; } @@ -120,7 +124,52 @@ void Aquamarine::COutputState::setCTM(const Hyprutils::Math::Mat3x3& ctm) { internalState.committed |= AQ_OUTPUT_STATE_CTM; } +void Aquamarine::COutputState::setPlaneEnabled(uint32_t planeIdx, bool enabled) { + if (planeIdx >= internalState.planeStates.size()) + return; + + internalState.planeStates.at(planeIdx).enabled = enabled; + internalState.planeStates.at(planeIdx).updated = true; + + internalState.committed |= AQ_OUTPUT_STATE_PLANE_STATE; +} + +void Aquamarine::COutputState::setPlaneBuffer(uint32_t planeIdx, Hyprutils::Memory::CSharedPointer buffer) { + if (planeIdx >= internalState.planeStates.size()) + return; + + internalState.planeStates.at(planeIdx).buffer = buffer; + internalState.planeStates.at(planeIdx).updated = true; + + internalState.committed |= AQ_OUTPUT_STATE_PLANE_STATE; +} + +void Aquamarine::COutputState::setPlaneGeometry(uint32_t planeIdx, const Hyprutils::Math::CBox& box) { + if (planeIdx >= internalState.planeStates.size()) + return; + + internalState.planeStates.at(planeIdx).geometry = box; + internalState.planeStates.at(planeIdx).updated = true; + + internalState.committed |= AQ_OUTPUT_STATE_PLANE_STATE; +} + +void Aquamarine::COutputState::addPlaneDamage(uint32_t planeIdx, const Hyprutils::Math::CRegion& region) { + if (planeIdx >= internalState.planeStates.size()) + return; + + internalState.planeStates.at(planeIdx).damage.add(region); + internalState.planeStates.at(planeIdx).updated = true; + + internalState.committed |= AQ_OUTPUT_STATE_PLANE_STATE; +} + void Aquamarine::COutputState::onCommit() { internalState.committed = 0; internalState.damage.clear(); + + for (auto& p : internalState.planeStates) { + p.damage.clear(); + p.updated = false; + } }