render/cm: various updates, remove old protocols (#12693)
* fix named primaries * default to gamma22 * mark mastering primaries as supported * remove xx-cm and frog support * immutable primaries and image descriptions * clang-format
This commit is contained in:
parent
42447a50d6
commit
6d3b17ee83
25 changed files with 334 additions and 3171 deletions
|
|
@ -46,7 +46,6 @@ class CColorManagementOutput {
|
|||
|
||||
class CColorManagementSurface {
|
||||
public:
|
||||
CColorManagementSurface(SP<CWLSurfaceResource> surface_); // temporary interface for frog CM
|
||||
CColorManagementSurface(SP<CWpColorManagementSurfaceV1> resource, SP<CWLSurfaceResource> surface_);
|
||||
|
||||
bool good();
|
||||
|
|
@ -67,14 +66,11 @@ class CColorManagementSurface {
|
|||
private:
|
||||
SP<CWpColorManagementSurfaceV1> m_resource;
|
||||
wl_client* m_client = nullptr;
|
||||
NColorManagement::SImageDescription m_imageDescription;
|
||||
NColorManagement::SImageDescription m_lastImageDescription;
|
||||
NColorManagement::PImageDescription m_imageDescription;
|
||||
NColorManagement::PImageDescription m_lastImageDescription;
|
||||
bool m_hasImageDescription = false;
|
||||
bool m_needsNewMetadata = false;
|
||||
hdr_output_metadata m_hdrMetadata;
|
||||
|
||||
friend class CXXColorManagementSurface;
|
||||
friend class CFrogColorManagementSurface;
|
||||
};
|
||||
|
||||
class CColorManagementFeedbackSurface {
|
||||
|
|
@ -157,7 +153,7 @@ class CColorManagementImageDescription {
|
|||
|
||||
WP<CColorManagementImageDescription> m_self;
|
||||
|
||||
NColorManagement::SImageDescription m_settings;
|
||||
NColorManagement::PImageDescription m_settings;
|
||||
|
||||
private:
|
||||
SP<CWpImageDescriptionV1> m_resource;
|
||||
|
|
@ -216,9 +212,6 @@ class CColorManagementProtocol : public IWaylandProtocol {
|
|||
friend class CColorManagementIccCreator;
|
||||
friend class CColorManagementParametricCreator;
|
||||
friend class CColorManagementImageDescription;
|
||||
|
||||
friend class CXXColorManagementSurface;
|
||||
friend class CFrogColorManagementSurface;
|
||||
};
|
||||
|
||||
namespace PROTO {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue