mirror of
https://github.com/hyprwm/Hyprland.git
synced 2025-09-01 12:23:48 -07:00
* syncobj: cleanup and use uniqueptrs cleanup a bit missing removals if resource not good, erasing from containers etc. make use of unique ptrs instead. and add default destructors. * syncobj: rework syncobj entirerly remove early buffer release that was breaking explicit sync, the buffer needs to exist until the surface commit event has been emitted and draw calls added egl sync points, move to eventfd signaling instead of stalling sync point checks, and recommit pending commits if waiting on a signal. add a CDRMSyncPointState helper class. move a few weak pointers to shared pointers so they dont destruct before we need to use them. * syncobj: queue pending states for eventfd eventfd requires us to queue pending stats until ready and then apply to current, and also when no ready state exist commit the client commit on the current existing buffer, if there is one. * syncobj: clear current buffer damage clear current buffer damage on current buffer commits. * syncobj: cleanup code and fix hyprlock remove unused code, and ensure we dont commit a empty texture causing locksession protocol and gtk4-layer-shell misbehaving. * syncobj: ensure buffers are cleaned up ensure the containers having the various buffers actually gets cleaned up from their containers, incase the CSignal isnt signaled because of expired smart pointers or just wrong order destruction because mishaps. also move the acquire/point setting to buffer attaching. instead of on precommit. * syncobj: remove unused code, optimize remove unused code and merge sync fds if fence is valid, remove manual directscanout buffer dropping that signals release point on pageflip, it can cause us to signal the release point while still keeping the current buffer and rendering it yet again causing wrong things. * syncobj: delay buffer release on non syncobj delay buffer releases on non syncobj surfaces until next commit, and check on async buffers if syncobj and drop and signal the release point on backend buffer release. * syncobj: ensure we follow protocol ensure we follow protocol by replacing acquire/release points if they arrive late and replace already existing ones. also remove unneded brackets, and dont try to manual lock/release buffers when it comes to explicit protocol. it doesnt care about buffer releases only about acquire and release points and signaling them. * syncobj: lets not complicate things set points in precommit, before checking protocol errors and we catch any pending acquire/release points arriving late. * syncobj: move SSurfaceState to types remove destructor resource destroying, let resources destroys them on their events, and move SSurfaceStates to types/SurfaceState.hpp * syncobj: actually store the merged fd have to actually store the mergedfd to use it. * syncobj: cleanup a bit around fences ensure the current asynchronous buffer is actually released on pageflip not the previous. cleanup a bit FD handling in commitPendingAndDoExplicitSync, and reuse the in fence when syncing surfaces. * syncobjs: ensure fence FD doesnt leak calling resetexplicitfence without properly ensuring the FD is closed before will leak it, store it per monitor and let it close itself with the CFileDescriptor class. * syncobj: ensure buffers are actually released buffers were never being sent released properly. * types: Defer buffer sync releaser until unlock * syncobj: store directscanout fence in monitor ensure the infence fd survives the scope of attemptdirectscanout so it doesnt close before it should have. * syncobj: check if if acquire is expired we might hit a race to finish on exit where the timeline just has destructed but the buffer waiter is still pending. and such we removeAllWaiters null dereferences. * syncobj: code style changes remove quack comment, change to m_foo and use a std::vector and weakpointer in the waiter for removal instead of a std::list. * syncobj: remove unused async buffer drop remove unused async buffer drop, only related to directscanout and is handled elsewhere. --------- Co-authored-by: Lee Bousfield <ljbousfield@gmail.com>
242 lines
9.3 KiB
C++
242 lines
9.3 KiB
C++
#pragma once
|
|
|
|
#include "../defines.hpp"
|
|
#include <stack>
|
|
#include <vector>
|
|
#include "../SharedDefs.hpp"
|
|
#include "MiscFunctions.hpp"
|
|
#include "WLClasses.hpp"
|
|
#include <array>
|
|
|
|
#include <xf86drmMode.h>
|
|
#include "Timer.hpp"
|
|
#include "math/Math.hpp"
|
|
#include <optional>
|
|
#include "../protocols/types/ColorManagement.hpp"
|
|
#include "signal/Signal.hpp"
|
|
#include "DamageRing.hpp"
|
|
#include <aquamarine/output/Output.hpp>
|
|
#include <aquamarine/allocator/Swapchain.hpp>
|
|
#include <hyprutils/os/FileDescriptor.hpp>
|
|
|
|
// Enum for the different types of auto directions, e.g. auto-left, auto-up.
|
|
enum eAutoDirs : uint8_t {
|
|
DIR_AUTO_NONE = 0, /* None will be treated as right. */
|
|
DIR_AUTO_UP,
|
|
DIR_AUTO_DOWN,
|
|
DIR_AUTO_LEFT,
|
|
DIR_AUTO_RIGHT
|
|
};
|
|
|
|
enum eCMType : uint8_t {
|
|
CM_AUTO = 0, // subject to change. srgb for 8bpc, wide for 10bpc if supported
|
|
CM_SRGB, // default, sRGB primaries
|
|
CM_WIDE, // wide color gamut, BT2020 primaries
|
|
CM_EDID, // primaries from edid (known to be inaccurate)
|
|
CM_HDR, // wide color gamut and HDR PQ transfer function
|
|
CM_HDR_EDID, // same as CM_HDR with edid primaries
|
|
};
|
|
|
|
struct SMonitorRule {
|
|
eAutoDirs autoDir = DIR_AUTO_NONE;
|
|
std::string name = "";
|
|
Vector2D resolution = Vector2D(1280, 720);
|
|
Vector2D offset = Vector2D(0, 0);
|
|
float scale = 1;
|
|
float refreshRate = 60; // Hz
|
|
bool disabled = false;
|
|
wl_output_transform transform = WL_OUTPUT_TRANSFORM_NORMAL;
|
|
std::string mirrorOf = "";
|
|
bool enable10bit = false;
|
|
eCMType cmType = CM_SRGB;
|
|
float sdrSaturation = 1.0f; // SDR -> HDR
|
|
float sdrBrightness = 1.0f; // SDR -> HDR
|
|
drmModeModeInfo drmMode = {};
|
|
std::optional<int> vrr;
|
|
};
|
|
|
|
class CMonitor;
|
|
class CSyncTimeline;
|
|
|
|
class CMonitorState {
|
|
public:
|
|
CMonitorState(CMonitor* owner);
|
|
~CMonitorState() = default;
|
|
|
|
bool commit();
|
|
bool test();
|
|
bool updateSwapchain();
|
|
|
|
private:
|
|
void ensureBufferPresent();
|
|
|
|
CMonitor* m_pOwner = nullptr;
|
|
};
|
|
|
|
class CMonitor {
|
|
public:
|
|
CMonitor(SP<Aquamarine::IOutput> output);
|
|
~CMonitor();
|
|
|
|
Vector2D vecPosition = Vector2D(-1, -1); // means unset
|
|
Vector2D vecXWaylandPosition = Vector2D(-1, -1); // means unset
|
|
Vector2D vecSize = Vector2D(0, 0);
|
|
Vector2D vecPixelSize = Vector2D(0, 0);
|
|
Vector2D vecTransformedSize = Vector2D(0, 0);
|
|
|
|
bool primary = false;
|
|
|
|
MONITORID ID = MONITOR_INVALID;
|
|
PHLWORKSPACE activeWorkspace = nullptr;
|
|
PHLWORKSPACE activeSpecialWorkspace = nullptr;
|
|
float setScale = 1; // scale set by cfg
|
|
float scale = 1; // real scale
|
|
|
|
std::string szName = "";
|
|
std::string szDescription = "";
|
|
std::string szShortDescription = "";
|
|
|
|
Vector2D vecReservedTopLeft = Vector2D(0, 0);
|
|
Vector2D vecReservedBottomRight = Vector2D(0, 0);
|
|
|
|
drmModeModeInfo customDrmMode = {};
|
|
|
|
CMonitorState state;
|
|
CDamageRing damage;
|
|
|
|
SP<Aquamarine::IOutput> output;
|
|
float refreshRate = 60; // Hz
|
|
int forceFullFrames = 0;
|
|
bool scheduledRecalc = false;
|
|
wl_output_transform transform = WL_OUTPUT_TRANSFORM_NORMAL;
|
|
float xwaylandScale = 1.f;
|
|
Mat3x3 projMatrix;
|
|
std::optional<Vector2D> forceSize;
|
|
SP<Aquamarine::SOutputMode> currentMode;
|
|
SP<Aquamarine::CSwapchain> cursorSwapchain;
|
|
uint32_t drmFormat = DRM_FORMAT_INVALID;
|
|
uint32_t prevDrmFormat = DRM_FORMAT_INVALID;
|
|
|
|
bool dpmsStatus = true;
|
|
bool vrrActive = false; // this can be TRUE even if VRR is not active in the case that this display does not support it.
|
|
bool enabled10bit = false; // as above, this can be TRUE even if 10 bit failed.
|
|
eCMType cmType = CM_SRGB;
|
|
float sdrSaturation = 1.0f;
|
|
float sdrBrightness = 1.0f;
|
|
bool createdByUser = false;
|
|
bool isUnsafeFallback = false;
|
|
|
|
bool pendingFrame = false; // if we schedule a frame during rendering, reschedule it after
|
|
bool renderingActive = false;
|
|
|
|
wl_event_source* renderTimer = nullptr; // for RAT
|
|
bool RATScheduled = false;
|
|
CTimer lastPresentationTimer;
|
|
|
|
bool isBeingLeased = false;
|
|
|
|
SMonitorRule activeMonitorRule;
|
|
|
|
// explicit sync
|
|
SP<CSyncTimeline> inTimeline;
|
|
SP<CSyncTimeline> outTimeline;
|
|
Hyprutils::OS::CFileDescriptor inFence;
|
|
uint64_t commitSeq = 0;
|
|
|
|
PHLMONITORREF self;
|
|
|
|
// mirroring
|
|
PHLMONITORREF pMirrorOf;
|
|
std::vector<PHLMONITORREF> mirrors;
|
|
|
|
// ctm
|
|
Mat3x3 ctm = Mat3x3::identity();
|
|
bool ctmUpdated = false;
|
|
|
|
// for tearing
|
|
PHLWINDOWREF solitaryClient;
|
|
|
|
// for direct scanout
|
|
PHLWINDOWREF lastScanout;
|
|
|
|
struct {
|
|
bool canTear = false;
|
|
bool nextRenderTorn = false;
|
|
bool activelyTearing = false;
|
|
|
|
bool busy = false;
|
|
bool frameScheduledWhileBusy = false;
|
|
} tearingState;
|
|
|
|
struct {
|
|
CSignal destroy;
|
|
CSignal connect;
|
|
CSignal disconnect;
|
|
CSignal dpmsChanged;
|
|
CSignal modeChanged;
|
|
} events;
|
|
|
|
std::array<std::vector<PHLLSREF>, 4> m_aLayerSurfaceLayers;
|
|
|
|
// methods
|
|
void onConnect(bool noRule);
|
|
void onDisconnect(bool destroy = false);
|
|
bool applyMonitorRule(SMonitorRule* pMonitorRule, bool force = false);
|
|
void addDamage(const pixman_region32_t* rg);
|
|
void addDamage(const CRegion& rg);
|
|
void addDamage(const CBox& box);
|
|
bool shouldSkipScheduleFrameOnMouseEvent();
|
|
void setMirror(const std::string&);
|
|
bool isMirror();
|
|
bool matchesStaticSelector(const std::string& selector) const;
|
|
float getDefaultScale();
|
|
void changeWorkspace(const PHLWORKSPACE& pWorkspace, bool internal = false, bool noMouseMove = false, bool noFocus = false);
|
|
void changeWorkspace(const WORKSPACEID& id, bool internal = false, bool noMouseMove = false, bool noFocus = false);
|
|
void setSpecialWorkspace(const PHLWORKSPACE& pWorkspace);
|
|
void setSpecialWorkspace(const WORKSPACEID& id);
|
|
void moveTo(const Vector2D& pos);
|
|
Vector2D middle();
|
|
void updateMatrix();
|
|
WORKSPACEID activeWorkspaceID();
|
|
WORKSPACEID activeSpecialWorkspaceID();
|
|
CBox logicalBox();
|
|
void scheduleDone();
|
|
bool attemptDirectScanout();
|
|
void setCTM(const Mat3x3& ctm);
|
|
void onCursorMovedOnMonitor();
|
|
|
|
void debugLastPresentation(const std::string& message);
|
|
void onMonitorFrame();
|
|
|
|
bool m_bEnabled = false;
|
|
bool m_bRenderingInitPassed = false;
|
|
WP<CWindow> m_previousFSWindow;
|
|
NColorManagement::SImageDescription imageDescription;
|
|
|
|
// For the list lookup
|
|
|
|
bool operator==(const CMonitor& rhs) {
|
|
return vecPosition == rhs.vecPosition && vecSize == rhs.vecSize && szName == rhs.szName;
|
|
}
|
|
|
|
// workspace previous per monitor functionality
|
|
SWorkspaceIDName getPrevWorkspaceIDName(const WORKSPACEID id);
|
|
void addPrevWorkspaceID(const WORKSPACEID id);
|
|
|
|
private:
|
|
void setupDefaultWS(const SMonitorRule&);
|
|
WORKSPACEID findAvailableDefaultWS();
|
|
|
|
bool doneScheduled = false;
|
|
std::stack<WORKSPACEID> prevWorkSpaces;
|
|
|
|
struct {
|
|
CHyprSignalListener frame;
|
|
CHyprSignalListener destroy;
|
|
CHyprSignalListener state;
|
|
CHyprSignalListener needsFrame;
|
|
CHyprSignalListener presented;
|
|
CHyprSignalListener commit;
|
|
} listeners;
|
|
};
|