fdo-mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-20 02:10:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

render/vulkan: add suport for color encoding and range

Browse source
This commit is contained in:
Simon Ser 2025-10-28 20:44:48 +01:00 • committed by Simon Zeni
parent 2a87ec8a35
commit fecaf6d1e8
3 changed files with 70 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/render/vulkan.h
View file

@ -127,8 +127,14 @@ const struct wlr_vk_format_modifier_props *vulkan_format_props_find_modifier(
void vulkan_format_props_finish(struct wlr_vk_format_props *props);
struct wlr_vk_pipeline_layout_key {
const struct wlr_vk_format *ycbcr_format;
enum wlr_scale_filter_mode filter_mode;
// for YCbCr pipelines only
struct {
const struct wlr_vk_format *format;
enum wlr_color_encoding encoding;
enum wlr_color_range range;
} ycbcr;
};
struct wlr_vk_pipeline_layout {

18
render/vulkan/pass.c
View file

@ -681,7 +681,7 @@ static void render_pass_add_rect(struct wlr_render_pass *wlr_pass,
pass->render_setup,
&(struct wlr_vk_pipeline_key) {
.source = WLR_VK_SHADER_SOURCE_SINGLE_COLOR,
.layout = { .ycbcr_format = NULL },
.layout = {0},
});
if (!pipe) {
pass->failed = true;
@ -807,12 +807,26 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
break;
}
enum wlr_color_encoding color_encoding = options->color_encoding;
if (texture->format->is_ycbcr && color_encoding == WLR_COLOR_ENCODING_NONE) {
color_encoding = WLR_COLOR_ENCODING_BT601;
}
enum wlr_color_range color_range = options->color_range;
if (texture->format->is_ycbcr && color_range == WLR_COLOR_RANGE_NONE) {
color_range = WLR_COLOR_RANGE_LIMITED;
}
struct wlr_vk_pipeline *pipe = setup_get_or_create_pipeline(
pass->render_setup,
&(struct wlr_vk_pipeline_key) {
.source = WLR_VK_SHADER_SOURCE_TEXTURE,
.layout = {
.ycbcr_format = texture->format->is_ycbcr ? texture->format : NULL,
.ycbcr = {
.format = texture->format->is_ycbcr ? texture->format : NULL,
.encoding = color_encoding,
.range = color_range,
},
.filter_mode = options->filter_mode,
},
.texture_transform = tex_transform,

73
render/vulkan/renderer.c
View file

@ -1630,14 +1630,16 @@ static bool init_blend_to_output_layouts(struct wlr_vk_renderer *renderer) {
static bool pipeline_layout_key_equals(
const struct wlr_vk_pipeline_layout_key *a,
const struct wlr_vk_pipeline_layout_key *b) {
assert(!a->ycbcr_format || a->ycbcr_format->is_ycbcr);
assert(!b->ycbcr_format || b->ycbcr_format->is_ycbcr);
assert(!a->ycbcr.format || a->ycbcr.format->is_ycbcr);
assert(!b->ycbcr.format || b->ycbcr.format->is_ycbcr);
if (a->filter_mode != b->filter_mode) {
return false;
}
if (a->ycbcr_format != b->ycbcr_format) {
if (a->ycbcr.format != b->ycbcr.format ||
a->ycbcr.encoding != b->ycbcr.encoding ||
a->ycbcr.range != b->ycbcr.range) {
return false;
}
@ -1945,6 +1947,33 @@ static bool init_blend_to_output_pipeline(struct wlr_vk_renderer *renderer,
return true;
}
static VkSamplerYcbcrModelConversion ycbcr_model_from_wlr(enum wlr_color_encoding encoding) {
switch (encoding) {
case WLR_COLOR_ENCODING_NONE:
abort(); // must be explicit
case WLR_COLOR_ENCODING_BT601:
return VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_601;
case WLR_COLOR_ENCODING_BT709:
return VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_709;
case WLR_COLOR_ENCODING_BT2020:
return VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_2020;
default:
abort(); // unsupported
}
}
static VkSamplerYcbcrRange ycbcr_range_from_wlr(enum wlr_color_range range) {
switch (range) {
case WLR_COLOR_RANGE_NONE:
abort(); // must be explicit
case WLR_COLOR_RANGE_LIMITED:
return VK_SAMPLER_YCBCR_RANGE_ITU_NARROW;
case WLR_COLOR_RANGE_FULL:
return VK_SAMPLER_YCBCR_RANGE_ITU_FULL;
}
abort(); // unreachable
}
struct wlr_vk_pipeline_layout *get_or_create_pipeline_layout(
struct wlr_vk_renderer *renderer,
const struct wlr_vk_pipeline_layout_key *key) {
@ -1986,12 +2015,12 @@ struct wlr_vk_pipeline_layout *get_or_create_pipeline_layout(
.maxLod = 0.25f,
};
if (key->ycbcr_format) {
if (key->ycbcr.format) {
VkSamplerYcbcrConversionCreateInfo conversion_create_info = {
.sType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO,
.format = key->ycbcr_format->vk,
.ycbcrModel = VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_601,
.ycbcrRange = VK_SAMPLER_YCBCR_RANGE_ITU_NARROW,
.format = key->ycbcr.format->vk,
.ycbcrModel = ycbcr_model_from_wlr(key->ycbcr.encoding),
.ycbcrRange = ycbcr_range_from_wlr(key->ycbcr.range),
.xChromaOffset = VK_CHROMA_LOCATION_MIDPOINT,
.yChromaOffset = VK_CHROMA_LOCATION_MIDPOINT,
.chromaFilter = VK_FILTER_LINEAR,
@ -2009,6 +2038,9 @@ struct wlr_vk_pipeline_layout *get_or_create_pipeline_layout(
.conversion = pipeline_layout->ycbcr.conversion,
};
sampler_create_info.pNext = &conversion_info;
} else {
assert(key->ycbcr.encoding == WLR_COLOR_ENCODING_NONE);
assert(key->ycbcr.range == WLR_COLOR_RANGE_NONE);
}
res = vkCreateSampler(renderer->dev->dev, &sampler_create_info, NULL, &pipeline_layout->sampler);
@ -2429,7 +2461,7 @@ static struct wlr_vk_render_format_setup *find_or_create_render_setup(
if (!setup_get_or_create_pipeline(setup, &(struct wlr_vk_pipeline_key){
.source = WLR_VK_SHADER_SOURCE_SINGLE_COLOR,
.layout = { .ycbcr_format = NULL },
.layout = {0},
})) {
goto error;
}
@ -2437,7 +2469,7 @@ static struct wlr_vk_render_format_setup *find_or_create_render_setup(
if (!setup_get_or_create_pipeline(setup, &(struct wlr_vk_pipeline_key){
.source = WLR_VK_SHADER_SOURCE_TEXTURE,
.texture_transform = WLR_VK_TEXTURE_TRANSFORM_IDENTITY,
.layout = {.ycbcr_format = NULL },
.layout = {0},
})) {
goto error;
}
@ -2445,27 +2477,11 @@ static struct wlr_vk_render_format_setup *find_or_create_render_setup(
if (!setup_get_or_create_pipeline(setup, &(struct wlr_vk_pipeline_key){
.source = WLR_VK_SHADER_SOURCE_TEXTURE,
.texture_transform = WLR_VK_TEXTURE_TRANSFORM_SRGB,
.layout = {.ycbcr_format = NULL },
.layout = {0},
})) {
goto error;
}
for (size_t i = 0; i < renderer->dev->format_prop_count; i++) {
const struct wlr_vk_format *format = &renderer->dev->format_props[i].format;
const struct wlr_vk_pipeline_layout_key layout = {
.ycbcr_format = format,
};
if (format->is_ycbcr) {
if (!setup_get_or_create_pipeline(setup, &(struct wlr_vk_pipeline_key){
.texture_transform = WLR_VK_TEXTURE_TRANSFORM_SRGB,
.layout = layout
})) {
goto error;
}
}
}
wl_list_insert(&renderer->render_format_setups, &setup->link);
return setup;
@ -2496,6 +2512,11 @@ struct wlr_renderer *vulkan_renderer_create_for_device(struct wlr_vk_device *dev
wl_list_init(&renderer->color_transforms);
wl_list_init(&renderer->pipeline_layouts);
renderer->wlr_renderer.color_encodings =
WLR_COLOR_ENCODING_BT601 |
WLR_COLOR_ENCODING_BT709 |
WLR_COLOR_ENCODING_BT2020;
uint64_t cap_syncobj_timeline;
if (dev->drm_fd >= 0 && drmGetCap(dev->drm_fd, DRM_CAP_SYNCOBJ_TIMELINE, &cap_syncobj_timeline) == 0) {
renderer->wlr_renderer.features.timeline = dev->sync_file_import_export && cap_syncobj_timeline != 0;