Skip to content

Commit dd66626

Browse files
committed
Display: remove detection of WCG enabled
1 parent fe7e684 commit dd66626

File tree

6 files changed

+2
-16
lines changed

6 files changed

+2
-16
lines changed

src/detection/displayserver/displayserver.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ FFDisplayResult* ffdsAppendDisplay(
3434

3535
display->bitDepth = 0;
3636
display->hdrEnabled = false;
37-
display->wcgEnabled = false;
3837

3938
return display;
4039
}

src/detection/displayserver/displayserver.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ typedef struct FFDisplayResult
6464
bool primary;
6565
uint8_t bitDepth;
6666
bool hdrEnabled;
67-
bool wcgEnabled;
6867
} FFDisplayResult;
6968

7069
typedef struct FFDisplayServerResult

src/detection/displayserver/displayserver_windows.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ static void detectDisplays(FFDisplayServerResult* ds)
178178
if (DisplayConfigGetDeviceInfo(&advColorInfo.header) == ERROR_SUCCESS)
179179
{
180180
display->hdrEnabled = !!advColorInfo.advancedColorEnabled;
181-
display->wcgEnabled = !!advColorInfo.wideColorEnforced;
182181
display->bitDepth = (uint8_t) advColorInfo.bitsPerColorChannel;
183182
}
184183
}

src/detection/displayserver/linux/wayland/kde-output.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,6 @@ static void waylandKdeHdrListener(void *data, FF_MAYBE_UNUSED struct kde_output_
119119
display->hdrEnabled = !!hdr_enabled;
120120
}
121121

122-
static void waylandKdeWcgListener(void *data, FF_MAYBE_UNUSED struct kde_output_device_v2 *kde_output_device_v2, uint32_t wcg_enabled)
123-
{
124-
WaylandDisplay* display = data;
125-
display->wcgEnabled = !!wcg_enabled;
126-
}
127-
128122
static struct kde_output_device_v2_listener outputListener = {
129123
.geometry = waylandKdeGeometryListener,
130124
.current_mode = waylandKdeCurrentModeListener,
@@ -143,7 +137,7 @@ static struct kde_output_device_v2_listener outputListener = {
143137
.name = waylandKdeNameListener,
144138
.high_dynamic_range = waylandKdeHdrListener,
145139
.sdr_brightness = (void*) stubListener,
146-
.wide_color_gamut = waylandKdeWcgListener,
140+
.wide_color_gamut = (void*) stubListener,
147141
.auto_rotate_policy = (void*) stubListener,
148142
.icc_profile_path = (void*) stubListener,
149143
.brightness_metadata = (void*) stubListener,
@@ -202,7 +196,6 @@ void ffWaylandHandleKdeOutput(WaylandData* wldata, struct wl_registry* registry,
202196
if (item)
203197
{
204198
item->hdrEnabled = display.hdrEnabled;
205-
item->wcgEnabled = display.wcgEnabled;
206199
}
207200

208201
ffStrbufDestroy(&display.description);

src/detection/displayserver/linux/wayland/wayland.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ typedef struct WaylandDisplay
4747
FFstrbuf edidName;
4848
uint64_t id;
4949
bool hdrEnabled;
50-
bool wcgEnabled;
5150
void* internal;
5251
} WaylandDisplay;
5352

src/modules/display/display.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <math.h>
88

9-
#define FF_DISPLAY_NUM_FORMAT_ARGS 16
9+
#define FF_DISPLAY_NUM_FORMAT_ARGS 15
1010

1111
static int sortByNameAsc(FFDisplayResult* a, FFDisplayResult* b)
1212
{
@@ -156,7 +156,6 @@ void ffPrintDisplay(FFDisplayOptions* options)
156156
{FF_FORMAT_ARG_TYPE_DOUBLE, &ppi, "ppi"},
157157
{FF_FORMAT_ARG_TYPE_UINT8, &result->bitDepth, "bit-depth"},
158158
{FF_FORMAT_ARG_TYPE_BOOL, &result->hdrEnabled, "hdr-enabled"},
159-
{FF_FORMAT_ARG_TYPE_BOOL, &result->wcgEnabled, "wcg-enabled"},
160159
}));
161160
}
162161
}
@@ -326,7 +325,6 @@ void ffGenerateDisplayJsonResult(FF_MAYBE_UNUSED FFDisplayOptions* options, yyjs
326325
yyjson_mut_obj_add_uint(doc, obj, "rotation", item->rotation);
327326
yyjson_mut_obj_add_uint(doc, obj, "bitDepth", item->bitDepth);
328327
yyjson_mut_obj_add_bool(doc, obj, "hdrEnabled", item->hdrEnabled);
329-
yyjson_mut_obj_add_bool(doc, obj, "wcgEnabled", item->wcgEnabled);
330328

331329
switch (item->type)
332330
{
@@ -361,7 +359,6 @@ void ffPrintDisplayHelpFormat(void)
361359
"Pixels per inch (PPI) - ppi",
362360
"Bits per color channel - bit-depth",
363361
"True if high dynamic range (HDR) is enabled - hdr-enabled",
364-
"True if wide color gamut (WCG) is enabled - wcg-enabled",
365362
}));
366363
}
367364

0 commit comments

Comments
 (0)