hyprwm/aquamarine
1
0
Fork 0
mirror of https://github.com/hyprwm/aquamarine.git synced 2024-11-17 06:06:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

initial work

Browse source
This commit is contained in:
Vaxry 2024-10-13 00:45:29 +01:00
parent 65dd97b5d2
commit bb05b4ebcd
2 changed files with 78 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
include/aquamarine/output/Output.hpp
View file

@ -53,6 +53,16 @@ namespace Aquamarine {
AQ_OUTPUT_STATE_EXPLICIT_IN_FENCE = (1 << 8), AQ_OUTPUT_STATE_EXPLICIT_IN_FENCE = (1 << 8),
AQ_OUTPUT_STATE_EXPLICIT_OUT_FENCE = (1 << 9), AQ_OUTPUT_STATE_EXPLICIT_OUT_FENCE = (1 << 9),
AQ_OUTPUT_STATE_CTM = (1 << 10), 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<IBuffer> buffer;
}; };
struct SInternalState { struct SInternalState {
@ -70,6 +80,7 @@ namespace Aquamarine {
Hyprutils::Memory::CSharedPointer<IBuffer> buffer; Hyprutils::Memory::CSharedPointer<IBuffer> buffer;
int64_t explicitInFence = -1, explicitOutFence = -1; int64_t explicitInFence = -1, explicitOutFence = -1;
Hyprutils::Math::Mat3x3 ctm; Hyprutils::Math::Mat3x3 ctm;
std::vector<SPlaneState> planeStates;
}; };
const SInternalState& state(); const SInternalState& state();
@ -88,6 +99,11 @@ namespace Aquamarine {
void setExplicitOutFence(int64_t fenceFD); // -1 removes void setExplicitOutFence(int64_t fenceFD); // -1 removes
void resetExplicitFences(); void resetExplicitFences();
void setCTM(const Hyprutils::Math::Mat3x3& ctm); void setCTM(const Hyprutils::Math::Mat3x3& ctm);
void setPlaneEnabled(uint32_t planeIdx, bool enabled);
void setPlaneBuffer(uint32_t planeIdx, Hyprutils::Memory::CSharedPointer<IBuffer> buffer);
void setPlaneGeometry(uint32_t planeIdx, const Hyprutils::Math::CBox& box);
void addPlaneDamage(uint32_t planeIdx, const Hyprutils::Math::CRegion& region);
private: private:
SInternalState internalState; SInternalState internalState;
@ -119,6 +135,18 @@ namespace Aquamarine {
AQ_SCHEDULE_ANIMATION_DAMAGE, 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<SDRMFormat> renderFormats; // empty if unknown / not specified -> use getRenderFormats()
planeType type = AQ_PLANE_UNKNOWN;
};
virtual bool commit() = 0; virtual bool commit() = 0;
virtual bool test() = 0; virtual bool test() = 0;
virtual Hyprutils::Memory::CSharedPointer<IBackendImplementation> getBackend() = 0; virtual Hyprutils::Memory::CSharedPointer<IBackendImplementation> getBackend() = 0;
@ -131,6 +159,7 @@ namespace Aquamarine {
virtual void scheduleFrame(const scheduleFrameReason reason = AQ_SCHEDULE_UNKNOWN); virtual void scheduleFrame(const scheduleFrameReason reason = AQ_SCHEDULE_UNKNOWN);
virtual size_t getGammaSize(); virtual size_t getGammaSize();
virtual bool destroy(); // not all backends allow this!!! virtual bool destroy(); // not all backends allow this!!!
virtual std::vector<SPlaneData> getPlanes();
std::string name, description, make, model, serial; std::string name, description, make, model, serial;
Hyprutils::Math::Vector2D physicalSize; Hyprutils::Math::Vector2D physicalSize;

49
src/output/Output.cpp
View file

@ -43,6 +43,10 @@ bool Aquamarine::IOutput::destroy() {
return false; return false;
} }
std::vector<Aquamarine::IOutput::SPlaneData> Aquamarine::IOutput::getPlanes() {
return {{.renderFormats = {}, .type = AQ_PLANE_PRIMARY}};
}
const Aquamarine::COutputState::SInternalState& Aquamarine::COutputState::state() { const Aquamarine::COutputState::SInternalState& Aquamarine::COutputState::state() {
return internalState; return internalState;
} }
@ -120,7 +124,52 @@ void Aquamarine::COutputState::setCTM(const Hyprutils::Math::Mat3x3& ctm) {
internalState.committed |= AQ_OUTPUT_STATE_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<IBuffer> 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() { void Aquamarine::COutputState::onCommit() {
internalState.committed = 0; internalState.committed = 0;
internalState.damage.clear(); internalState.damage.clear();
for (auto& p : internalState.planeStates) {
p.damage.clear();
p.updated = false;
}
} }