hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-26 06:35:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

render/vulkan: drop unused fields from wlr_vk_format_modifier_props

Browse source 
export_imported is never used, and dmabuf_flags is already checked
in query_modifier_support().
This commit is contained in:
Simon Ser 2022-11-28 10:22:56 +01:00
parent ab6607b950
commit 0730552e85
3 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/render/vulkan.h
View file

@ -88,9 +88,7 @@ const struct wlr_vk_format *vulkan_get_format_from_drm(uint32_t drm_format);
struct wlr_vk_format_modifier_props { struct wlr_vk_format_modifier_props {
VkDrmFormatModifierPropertiesEXT props; VkDrmFormatModifierPropertiesEXT props;
VkExternalMemoryFeatureFlags dmabuf_flags;
VkExtent2D max_extent; VkExtent2D max_extent;
bool export_imported;
}; };
struct wlr_vk_format_props { struct wlr_vk_format_props {

10
render/vulkan/pixel_format.c
View file

@ -168,14 +168,9 @@ static bool query_modifier_support(struct wlr_vk_device *dev,
VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT) { VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT) {
unsigned c = props->render_mod_count; unsigned c = props->render_mod_count;
VkExtent3D me = ifmtp.imageFormatProperties.maxExtent; VkExtent3D me = ifmtp.imageFormatProperties.maxExtent;
VkExternalMemoryProperties emp = efmtp.externalMemoryProperties;
props->render_mods[c].props = m; props->render_mods[c].props = m;
props->render_mods[c].max_extent.width = me.width; props->render_mods[c].max_extent.width = me.width;
props->render_mods[c].max_extent.height = me.height; props->render_mods[c].max_extent.height = me.height;
props->render_mods[c].dmabuf_flags = emp.externalMemoryFeatures;
props->render_mods[c].export_imported =
(emp.exportFromImportedHandleTypes &
VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT);
++props->render_mod_count; ++props->render_mod_count;
found = true; found = true;
@ -208,14 +203,9 @@ static bool query_modifier_support(struct wlr_vk_device *dev,
VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT) { VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT) {
unsigned c = props->texture_mod_count; unsigned c = props->texture_mod_count;
VkExtent3D me = ifmtp.imageFormatProperties.maxExtent; VkExtent3D me = ifmtp.imageFormatProperties.maxExtent;
VkExternalMemoryProperties emp = efmtp.externalMemoryProperties;
props->texture_mods[c].props = m; props->texture_mods[c].props = m;
props->texture_mods[c].max_extent.width = me.width; props->texture_mods[c].max_extent.width = me.width;
props->texture_mods[c].max_extent.height = me.height; props->texture_mods[c].max_extent.height = me.height;
props->texture_mods[c].dmabuf_flags = emp.externalMemoryFeatures;
props->texture_mods[c].export_imported =
(emp.exportFromImportedHandleTypes &
VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT);
++props->texture_mod_count; ++props->texture_mod_count;
found = true; found = true;

2
render/vulkan/texture.c
View file

@ -453,7 +453,7 @@ VkImage vulkan_import_dmabuf(struct wlr_vk_renderer *renderer,
assert(plane_count < WLR_DMABUF_MAX_PLANES); assert(plane_count < WLR_DMABUF_MAX_PLANES);
struct wlr_vk_format_modifier_props *mod = struct wlr_vk_format_modifier_props *mod =
vulkan_format_props_find_modifier(fmt, attribs->modifier, for_render); vulkan_format_props_find_modifier(fmt, attribs->modifier, for_render);
if (!mod || !(mod->dmabuf_flags & VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT)) { if (!mod) {
wlr_log(WLR_ERROR, "Format %"PRIx32" (%.4s) can't be used with modifier " wlr_log(WLR_ERROR, "Format %"PRIx32" (%.4s) can't be used with modifier "
"%"PRIx64, attribs->format, (const char*) &attribs->format, "%"PRIx64, attribs->format, (const char*) &attribs->format,
attribs->modifier); attribs->modifier);