mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-21 06:46:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'refactor-vulkan-modifier-tests' into 'master'

Browse source 
render/vulkan: Refactor image usages for modifiers

See merge request wlroots/wlroots!3339
This commit is contained in:
Joshua Ashton 2022-09-12 15:41:54 +00:00
commit a41c953555
5 changed files with 102 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

6
render/vulkan/renderer.c
View file

@ -435,7 +435,7 @@ static struct wlr_vk_render_buffer *create_render_buffer(
(const char*) &dmabuf.format, dmabuf.width, dmabuf.height);
buffer->image = vulkan_import_dmabuf(renderer, &dmabuf,
buffer->memories, &buffer->mem_count, true);
buffer->memories, &buffer->mem_count, WLR_VK_IMAGE_USAGE_RENDER);
if (!buffer->image) {
goto error_buffer;
}
@ -887,13 +887,13 @@ static void vulkan_render_quad_with_matrix(struct wlr_renderer *wlr_renderer,
static const struct wlr_drm_format_set *vulkan_get_dmabuf_texture_formats(
struct wlr_renderer *wlr_renderer) {
struct wlr_vk_renderer *renderer = vulkan_get_renderer(wlr_renderer);
return &renderer->dev->dmabuf_texture_formats;
return &renderer->dev->dmabuf_formats[WLR_VK_IMAGE_USAGE_SAMPLED];
}
static const struct wlr_drm_format_set *vulkan_get_render_formats(
struct wlr_renderer *wlr_renderer) {
struct wlr_vk_renderer *renderer = vulkan_get_renderer(wlr_renderer);
return &renderer->dev->dmabuf_render_formats;
return &renderer->dev->dmabuf_formats[WLR_VK_IMAGE_USAGE_RENDER];
}
static uint32_t vulkan_preferred_read_format(