diff options
| author | Daniel Stone <[email protected]> | 2018-02-09 15:43:26 -0800 |
|---|---|---|
| committer | Daniel Stone <[email protected]> | 2018-02-21 22:37:10 +0000 |
| commit | 55b27e1e5f21d62855e955446a63afb5ef8b97a6 (patch) | |
| tree | bbae99a4a28ca098e5ce6582a5dcdaa9fcc53323 | |
| parent | 61c3feb38dcae3feb1176426903ca8e0046edd12 (diff) | |
vulkan/wsi: Add drm_modifier member to wsi_image
Not yet used anywhere.
Signed-off-by: Daniel Stone <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
| -rw-r--r-- | src/vulkan/Makefile.am | 1 | ||||
| -rw-r--r-- | src/vulkan/wsi/meson.build | 2 | ||||
| -rw-r--r-- | src/vulkan/wsi/wsi_common.c | 3 | ||||
| -rw-r--r-- | src/vulkan/wsi/wsi_common_private.h | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am index 037436c1cd7..4fdaedf38c1 100644 --- a/src/vulkan/Makefile.am +++ b/src/vulkan/Makefile.am @@ -36,6 +36,7 @@ libvulkan_util_la_SOURCES = $(VULKAN_UTIL_SOURCES) AM_CPPFLAGS = \ $(DEFINES) \ -I$(top_srcdir)/include \ + -I$(top_srcdir)/include/drm-uapi \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/vulkan/util \ -I$(top_srcdir)/src/gallium/auxiliary \ diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build index bd0fd3cc53e..66ccc8316ec 100644 --- a/src/vulkan/wsi/meson.build +++ b/src/vulkan/wsi/meson.build @@ -60,7 +60,7 @@ endif libvulkan_wsi = static_library( 'vulkan_wsi', files_vulkan_wsi, - include_directories : [inc_common, inc_vulkan_util], + include_directories : [inc_common, inc_vulkan_util, inc_drm_uapi], dependencies : [vulkan_wsi_deps, dep_libdrm], c_args : [c_vis_args, vulkan_wsi_args], build_by_default : false, diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c index f257eb08755..c235128e562 100644 --- a/src/vulkan/wsi/wsi_common.c +++ b/src/vulkan/wsi/wsi_common.c @@ -22,6 +22,7 @@ */ #include "wsi_common_private.h" +#include "drm_fourcc.h" #include "util/macros.h" #include "vk_util.h" @@ -291,6 +292,7 @@ wsi_create_native_image(const struct wsi_swapchain *chain, if (result != VK_SUCCESS) goto fail; + image->drm_modifier = DRM_FORMAT_MOD_INVALID; image->num_planes = 1; image->sizes[0] = reqs.size; image->row_pitches[0] = image_layout.rowPitch; @@ -494,6 +496,7 @@ wsi_create_prime_image(const struct wsi_swapchain *chain, if (result != VK_SUCCESS) goto fail; + image->drm_modifier = DRM_FORMAT_MOD_LINEAR; image->num_planes = 1; image->sizes[0] = linear_size; image->row_pitches[0] = linear_stride; diff --git a/src/vulkan/wsi/wsi_common_private.h b/src/vulkan/wsi/wsi_common_private.h index c5002ec8eca..781e84635f9 100644 --- a/src/vulkan/wsi/wsi_common_private.h +++ b/src/vulkan/wsi/wsi_common_private.h @@ -35,6 +35,7 @@ struct wsi_image { VkCommandBuffer *blit_cmd_buffers; } prime; + uint64_t drm_modifier; int num_planes; uint32_t sizes[4]; uint32_t offsets[4]; |