Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2026-08-02 05:12:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[client] hdr: refactor name to clean up log output

Browse Source
This commit is contained in:
Geoffrey McRae
2026-07-29 10:13:02 +10:00
parent 737614bc69
commit 61f00ae625
8 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
client/displayservers/Wayland/gl.c
View File

@@ -83,7 +83,7 @@ static void applyHDRPending(void)
if (action == WAYLAND_HDR_PENDING_APPLY)
{
waylandSetHDRImageDescription(
waylandSetHDRImageDesc(
params.displayPrimary, params.whitePoint,
params.maxDisplayLuminance,
params.minDisplayLuminance,
@@ -94,10 +94,10 @@ static void applyHDRPending(void)
params.metadata);
}
else if (action == WAYLAND_HDR_PENDING_CLEAR)
waylandClearHDRImageDescription();
waylandClearHDRImageDesc();
}
void waylandClearHDRImageDescription(void)
void waylandClearHDRImageDesc(void)
{
LG_LOCK(wlWm.hdrLock);
if (wlWm.hdrImageCreator)
@@ -120,7 +120,7 @@ void waylandClearHDRImageDescription(void)
DEBUG_INFO("HDR image description removed from surface");
}
static void hdrImageDescriptionReady(struct wp_image_description_v1 * desc)
static void hdrImageDescReady(struct wp_image_description_v1 * desc)
{
LG_LOCK(wlWm.hdrLock);
if (desc != wlWm.hdrImageDesc)
@@ -150,7 +150,7 @@ static void hdrImageDescriptionReady(struct wp_image_description_v1 * desc)
waylandStopWaitFrame();
}
static void activateReadyHDRImageDescription(void)
static void activateReadyHDRImageDesc(void)
{
LG_LOCK(wlWm.hdrLock);
if (!wlWm.hdrImageDesc || !wlWm.hdrImageDescReady || !wlWm.colorSurface)
@@ -180,7 +180,7 @@ static void activateReadyHDRImageDescription(void)
waylandStopWaitFrame();
}
static void hdrImageDescriptionFailed(void * data,
static void hdrImageDescFailed(void * data,
struct wp_image_description_v1 * desc, uint32_t cause, const char * message)
{
(void)data;
@@ -203,29 +203,29 @@ static void hdrImageDescriptionFailed(void * data,
waylandStopWaitFrame();
}
static void hdrImageDescriptionReadyV1(void * data,
static void hdrImageDescReadyV1(void * data,
struct wp_image_description_v1 * desc, uint32_t identity)
{
(void)data;
(void)identity;
hdrImageDescriptionReady(desc);
hdrImageDescReady(desc);
}
static void hdrImageDescriptionReadyV2(void * data,
static void hdrImageDescReadyV2(void * data,
struct wp_image_description_v1 * desc, uint32_t identityHi,
uint32_t identityLo)
{
(void)data;
(void)identityHi;
(void)identityLo;
hdrImageDescriptionReady(desc);
hdrImageDescReady(desc);
}
static const struct wp_image_description_v1_listener hdrImageDescListener =
{
.failed = hdrImageDescriptionFailed,
.ready = hdrImageDescriptionReadyV1,
.ready2 = hdrImageDescriptionReadyV2,
.failed = hdrImageDescFailed,
.ready = hdrImageDescReadyV1,
.ready2 = hdrImageDescReadyV2,
};
void waylandEGLSwapBuffers(EGLDisplay display, EGLSurface surface, const struct Rect * damage, int count)
@@ -244,7 +244,7 @@ void waylandEGLSwapBuffers(EGLDisplay display, EGLSurface surface, const struct
waylandPresentationFrame();
applyHDRPending();
swapWithDamage(&wlWm.swapWithDamage, display, surface, damage, count);
activateReadyHDRImageDescription();
activateReadyHDRImageDesc();
if (wlWm.needsResize)
{
@@ -363,7 +363,7 @@ static bool hdrTargetLuminanceContained(uint32_t minLuminance,
maxLuminance <= HDR_PQ_MAX_LUMINANCE;
}
void waylandSetHDRImageDescription(const uint16_t displayPrimary[3][2],
void waylandSetHDRImageDesc(const uint16_t displayPrimary[3][2],
const uint16_t whitePoint[2], uint32_t maxDisplayLuminance,
uint32_t minDisplayLuminance, uint32_t maxCLL, uint32_t maxFALL,
uint32_t referenceWhiteLevel, bool hdrPQ, bool hdrMetadata)

4
client/displayservers/Wayland/output.c
View File

@@ -240,7 +240,7 @@ static void outputRequestColorDescription(struct WaylandOutput * output)
desc->description, &outputDescriptionListener, desc);
}
static void outputImageDescriptionChanged(void * data,
static void outputImageDescChanged(void * data,
struct wp_color_management_output_v1 * colorOutput)
{
outputRequestColorDescription(data);
@@ -248,7 +248,7 @@ static void outputImageDescriptionChanged(void * data,
static const struct wp_color_management_output_v1_listener colorOutputListener =
{
.image_description_changed = outputImageDescriptionChanged,
.image_description_changed = outputImageDescChanged,
};
void waylandOutputColorMgmtInit(struct WaylandOutput * output)

2
client/displayservers/Wayland/wayland.c
View File

@@ -333,7 +333,7 @@ struct LG_DisplayServerOps LGDS_Wayland =
.getFullscreen = waylandGetFullscreen,
.minimize = waylandMinimize,
.setHDRImageDescription = waylandHDRCallback,
.setHDRImageDesc = waylandHDRCallback,
.cbInit = waylandCBInit,
.cbNotice = waylandCBNotice,

4
client/displayservers/Wayland/wayland.h
View File

@@ -345,11 +345,11 @@ void waylandGLSwapBuffers(void);
// HDR color management (Wayland color-management-v1)
bool waylandColorMgmtInit(void);
void waylandColorMgmtFree(void);
void waylandSetHDRImageDescription(const uint16_t displayPrimary[3][2],
void waylandSetHDRImageDesc(const uint16_t displayPrimary[3][2],
const uint16_t whitePoint[2], uint32_t maxDisplayLuminance,
uint32_t minDisplayLuminance, uint32_t maxCLL, uint32_t maxFALL,
uint32_t referenceWhiteLevel, bool hdrPQ, bool hdrMetadata);
void waylandClearHDRImageDescription(void);
void waylandClearHDRImageDesc(void);
// Queue HDR change from any thread (applied in waylandEGLSwapBuffers).
// Returns true if the request was queued, false if HDR is not available