From 170ddba9bebbd5db9567927d20120efc7bf1848d Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Thu, 29 Jul 2021 17:09:44 -0700 Subject: [PATCH] vkr: move to a subdirectory No functional change. Signed-off-by: Chia-I Wu Reviewed-by: Yiwei Zhang Reviewed-by: Ryan Neph --- src/meson.build | 20 +++++++++---------- .../venus/.clang-format | 0 src/{ => venus}/venus-protocol/vk_platform.h | 0 .../venus-protocol/vn_protocol_renderer.h | 0 .../vn_protocol_renderer_buffer.h | 0 .../vn_protocol_renderer_buffer_view.h | 0 .../vn_protocol_renderer_command_buffer.h | 0 .../vn_protocol_renderer_command_pool.h | 0 .../venus-protocol/vn_protocol_renderer_cs.h | 0 .../vn_protocol_renderer_defines.h | 0 .../vn_protocol_renderer_descriptor_pool.h | 0 .../vn_protocol_renderer_descriptor_set.h | 0 ..._protocol_renderer_descriptor_set_layout.h | 0 ...ocol_renderer_descriptor_update_template.h | 0 .../vn_protocol_renderer_device.h | 0 .../vn_protocol_renderer_device_memory.h | 0 .../vn_protocol_renderer_dispatches.h | 0 .../vn_protocol_renderer_event.h | 0 .../vn_protocol_renderer_fence.h | 0 .../vn_protocol_renderer_framebuffer.h | 0 .../vn_protocol_renderer_handles.h | 0 .../vn_protocol_renderer_image.h | 0 .../vn_protocol_renderer_image_view.h | 0 .../vn_protocol_renderer_info.h | 0 .../vn_protocol_renderer_instance.h | 0 .../vn_protocol_renderer_pipeline.h | 0 .../vn_protocol_renderer_pipeline_cache.h | 0 .../vn_protocol_renderer_pipeline_layout.h | 0 .../vn_protocol_renderer_query_pool.h | 0 .../vn_protocol_renderer_queue.h | 0 .../vn_protocol_renderer_render_pass.h | 0 .../vn_protocol_renderer_sampler.h | 0 ...otocol_renderer_sampler_ycbcr_conversion.h | 0 .../vn_protocol_renderer_semaphore.h | 0 .../vn_protocol_renderer_shader_module.h | 0 .../vn_protocol_renderer_structs.h | 0 .../vn_protocol_renderer_transport.h | 0 .../vn_protocol_renderer_types.h | 0 src/{ => venus}/venus-protocol/vulkan.h | 0 src/{ => venus}/venus-protocol/vulkan_core.h | 0 src/{ => venus}/vkr_cs.c | 0 src/{ => venus}/vkr_cs.h | 0 src/{ => venus}/vkr_object.h | 0 src/{ => venus}/vkr_renderer.c | 0 src/{ => venus}/vkr_renderer.h | 0 src/{ => venus}/vkr_ring.c | 0 src/{ => venus}/vkr_ring.h | 0 47 files changed, 10 insertions(+), 10 deletions(-) rename docs/vkr-clang-format => src/venus/.clang-format (100%) rename src/{ => venus}/venus-protocol/vk_platform.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_buffer.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_buffer_view.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_command_buffer.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_command_pool.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_cs.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_defines.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_descriptor_pool.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_descriptor_set.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_descriptor_set_layout.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_descriptor_update_template.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_device.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_device_memory.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_dispatches.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_event.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_fence.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_framebuffer.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_handles.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_image.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_image_view.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_info.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_instance.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_pipeline.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_pipeline_cache.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_pipeline_layout.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_query_pool.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_queue.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_render_pass.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_sampler.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_sampler_ycbcr_conversion.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_semaphore.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_shader_module.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_structs.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_transport.h (100%) rename src/{ => venus}/venus-protocol/vn_protocol_renderer_types.h (100%) rename src/{ => venus}/venus-protocol/vulkan.h (100%) rename src/{ => venus}/venus-protocol/vulkan_core.h (100%) rename src/{ => venus}/vkr_cs.c (100%) rename src/{ => venus}/vkr_cs.h (100%) rename src/{ => venus}/vkr_object.h (100%) rename src/{ => venus}/vkr_renderer.c (100%) rename src/{ => venus}/vkr_renderer.h (100%) rename src/{ => venus}/vkr_ring.c (100%) rename src/{ => venus}/vkr_ring.h (100%) diff --git a/src/meson.build b/src/meson.build index 575b7a3..973ead0 100644 --- a/src/meson.build +++ b/src/meson.build @@ -75,15 +75,15 @@ vrend_winsys_glx_sources = [ ] venus_sources = [ - 'venus-protocol/vn_protocol_renderer.h', 'venus_hw.h', - 'vkr_cs.c', - 'vkr_cs.h', - 'vkr_object.h', - 'vkr_renderer.c', - 'vkr_renderer.h', - 'vkr_ring.c', - 'vkr_ring.h', + 'venus/venus-protocol/vn_protocol_renderer.h', + 'venus/vkr_cs.c', + 'venus/vkr_cs.h', + 'venus/vkr_object.h', + 'venus/vkr_renderer.c', + 'venus/vkr_renderer.h', + 'venus/vkr_ring.c', + 'venus/vkr_ring.h', ] virgl_depends = [ @@ -122,14 +122,14 @@ endif libvirgl = static_library( 'virgl', virgl_sources, - include_directories: [inc_gallium, inc_configuration], + include_directories: [inc_gallium, inc_configuration, 'venus'], dependencies : virgl_depends, ) libvirgl_inc = [ inc_gallium, inc_configuration, - include_directories('.') + include_directories(['.', 'venus']) ] libvirgl_dep = declare_dependency( diff --git a/docs/vkr-clang-format b/src/venus/.clang-format similarity index 100% rename from docs/vkr-clang-format rename to src/venus/.clang-format diff --git a/src/venus-protocol/vk_platform.h b/src/venus/venus-protocol/vk_platform.h similarity index 100% rename from src/venus-protocol/vk_platform.h rename to src/venus/venus-protocol/vk_platform.h diff --git a/src/venus-protocol/vn_protocol_renderer.h b/src/venus/venus-protocol/vn_protocol_renderer.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer.h rename to src/venus/venus-protocol/vn_protocol_renderer.h diff --git a/src/venus-protocol/vn_protocol_renderer_buffer.h b/src/venus/venus-protocol/vn_protocol_renderer_buffer.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_buffer.h rename to src/venus/venus-protocol/vn_protocol_renderer_buffer.h diff --git a/src/venus-protocol/vn_protocol_renderer_buffer_view.h b/src/venus/venus-protocol/vn_protocol_renderer_buffer_view.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_buffer_view.h rename to src/venus/venus-protocol/vn_protocol_renderer_buffer_view.h diff --git a/src/venus-protocol/vn_protocol_renderer_command_buffer.h b/src/venus/venus-protocol/vn_protocol_renderer_command_buffer.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_command_buffer.h rename to src/venus/venus-protocol/vn_protocol_renderer_command_buffer.h diff --git a/src/venus-protocol/vn_protocol_renderer_command_pool.h b/src/venus/venus-protocol/vn_protocol_renderer_command_pool.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_command_pool.h rename to src/venus/venus-protocol/vn_protocol_renderer_command_pool.h diff --git a/src/venus-protocol/vn_protocol_renderer_cs.h b/src/venus/venus-protocol/vn_protocol_renderer_cs.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_cs.h rename to src/venus/venus-protocol/vn_protocol_renderer_cs.h diff --git a/src/venus-protocol/vn_protocol_renderer_defines.h b/src/venus/venus-protocol/vn_protocol_renderer_defines.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_defines.h rename to src/venus/venus-protocol/vn_protocol_renderer_defines.h diff --git a/src/venus-protocol/vn_protocol_renderer_descriptor_pool.h b/src/venus/venus-protocol/vn_protocol_renderer_descriptor_pool.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_descriptor_pool.h rename to src/venus/venus-protocol/vn_protocol_renderer_descriptor_pool.h diff --git a/src/venus-protocol/vn_protocol_renderer_descriptor_set.h b/src/venus/venus-protocol/vn_protocol_renderer_descriptor_set.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_descriptor_set.h rename to src/venus/venus-protocol/vn_protocol_renderer_descriptor_set.h diff --git a/src/venus-protocol/vn_protocol_renderer_descriptor_set_layout.h b/src/venus/venus-protocol/vn_protocol_renderer_descriptor_set_layout.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_descriptor_set_layout.h rename to src/venus/venus-protocol/vn_protocol_renderer_descriptor_set_layout.h diff --git a/src/venus-protocol/vn_protocol_renderer_descriptor_update_template.h b/src/venus/venus-protocol/vn_protocol_renderer_descriptor_update_template.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_descriptor_update_template.h rename to src/venus/venus-protocol/vn_protocol_renderer_descriptor_update_template.h diff --git a/src/venus-protocol/vn_protocol_renderer_device.h b/src/venus/venus-protocol/vn_protocol_renderer_device.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_device.h rename to src/venus/venus-protocol/vn_protocol_renderer_device.h diff --git a/src/venus-protocol/vn_protocol_renderer_device_memory.h b/src/venus/venus-protocol/vn_protocol_renderer_device_memory.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_device_memory.h rename to src/venus/venus-protocol/vn_protocol_renderer_device_memory.h diff --git a/src/venus-protocol/vn_protocol_renderer_dispatches.h b/src/venus/venus-protocol/vn_protocol_renderer_dispatches.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_dispatches.h rename to src/venus/venus-protocol/vn_protocol_renderer_dispatches.h diff --git a/src/venus-protocol/vn_protocol_renderer_event.h b/src/venus/venus-protocol/vn_protocol_renderer_event.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_event.h rename to src/venus/venus-protocol/vn_protocol_renderer_event.h diff --git a/src/venus-protocol/vn_protocol_renderer_fence.h b/src/venus/venus-protocol/vn_protocol_renderer_fence.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_fence.h rename to src/venus/venus-protocol/vn_protocol_renderer_fence.h diff --git a/src/venus-protocol/vn_protocol_renderer_framebuffer.h b/src/venus/venus-protocol/vn_protocol_renderer_framebuffer.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_framebuffer.h rename to src/venus/venus-protocol/vn_protocol_renderer_framebuffer.h diff --git a/src/venus-protocol/vn_protocol_renderer_handles.h b/src/venus/venus-protocol/vn_protocol_renderer_handles.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_handles.h rename to src/venus/venus-protocol/vn_protocol_renderer_handles.h diff --git a/src/venus-protocol/vn_protocol_renderer_image.h b/src/venus/venus-protocol/vn_protocol_renderer_image.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_image.h rename to src/venus/venus-protocol/vn_protocol_renderer_image.h diff --git a/src/venus-protocol/vn_protocol_renderer_image_view.h b/src/venus/venus-protocol/vn_protocol_renderer_image_view.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_image_view.h rename to src/venus/venus-protocol/vn_protocol_renderer_image_view.h diff --git a/src/venus-protocol/vn_protocol_renderer_info.h b/src/venus/venus-protocol/vn_protocol_renderer_info.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_info.h rename to src/venus/venus-protocol/vn_protocol_renderer_info.h diff --git a/src/venus-protocol/vn_protocol_renderer_instance.h b/src/venus/venus-protocol/vn_protocol_renderer_instance.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_instance.h rename to src/venus/venus-protocol/vn_protocol_renderer_instance.h diff --git a/src/venus-protocol/vn_protocol_renderer_pipeline.h b/src/venus/venus-protocol/vn_protocol_renderer_pipeline.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_pipeline.h rename to src/venus/venus-protocol/vn_protocol_renderer_pipeline.h diff --git a/src/venus-protocol/vn_protocol_renderer_pipeline_cache.h b/src/venus/venus-protocol/vn_protocol_renderer_pipeline_cache.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_pipeline_cache.h rename to src/venus/venus-protocol/vn_protocol_renderer_pipeline_cache.h diff --git a/src/venus-protocol/vn_protocol_renderer_pipeline_layout.h b/src/venus/venus-protocol/vn_protocol_renderer_pipeline_layout.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_pipeline_layout.h rename to src/venus/venus-protocol/vn_protocol_renderer_pipeline_layout.h diff --git a/src/venus-protocol/vn_protocol_renderer_query_pool.h b/src/venus/venus-protocol/vn_protocol_renderer_query_pool.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_query_pool.h rename to src/venus/venus-protocol/vn_protocol_renderer_query_pool.h diff --git a/src/venus-protocol/vn_protocol_renderer_queue.h b/src/venus/venus-protocol/vn_protocol_renderer_queue.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_queue.h rename to src/venus/venus-protocol/vn_protocol_renderer_queue.h diff --git a/src/venus-protocol/vn_protocol_renderer_render_pass.h b/src/venus/venus-protocol/vn_protocol_renderer_render_pass.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_render_pass.h rename to src/venus/venus-protocol/vn_protocol_renderer_render_pass.h diff --git a/src/venus-protocol/vn_protocol_renderer_sampler.h b/src/venus/venus-protocol/vn_protocol_renderer_sampler.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_sampler.h rename to src/venus/venus-protocol/vn_protocol_renderer_sampler.h diff --git a/src/venus-protocol/vn_protocol_renderer_sampler_ycbcr_conversion.h b/src/venus/venus-protocol/vn_protocol_renderer_sampler_ycbcr_conversion.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_sampler_ycbcr_conversion.h rename to src/venus/venus-protocol/vn_protocol_renderer_sampler_ycbcr_conversion.h diff --git a/src/venus-protocol/vn_protocol_renderer_semaphore.h b/src/venus/venus-protocol/vn_protocol_renderer_semaphore.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_semaphore.h rename to src/venus/venus-protocol/vn_protocol_renderer_semaphore.h diff --git a/src/venus-protocol/vn_protocol_renderer_shader_module.h b/src/venus/venus-protocol/vn_protocol_renderer_shader_module.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_shader_module.h rename to src/venus/venus-protocol/vn_protocol_renderer_shader_module.h diff --git a/src/venus-protocol/vn_protocol_renderer_structs.h b/src/venus/venus-protocol/vn_protocol_renderer_structs.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_structs.h rename to src/venus/venus-protocol/vn_protocol_renderer_structs.h diff --git a/src/venus-protocol/vn_protocol_renderer_transport.h b/src/venus/venus-protocol/vn_protocol_renderer_transport.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_transport.h rename to src/venus/venus-protocol/vn_protocol_renderer_transport.h diff --git a/src/venus-protocol/vn_protocol_renderer_types.h b/src/venus/venus-protocol/vn_protocol_renderer_types.h similarity index 100% rename from src/venus-protocol/vn_protocol_renderer_types.h rename to src/venus/venus-protocol/vn_protocol_renderer_types.h diff --git a/src/venus-protocol/vulkan.h b/src/venus/venus-protocol/vulkan.h similarity index 100% rename from src/venus-protocol/vulkan.h rename to src/venus/venus-protocol/vulkan.h diff --git a/src/venus-protocol/vulkan_core.h b/src/venus/venus-protocol/vulkan_core.h similarity index 100% rename from src/venus-protocol/vulkan_core.h rename to src/venus/venus-protocol/vulkan_core.h diff --git a/src/vkr_cs.c b/src/venus/vkr_cs.c similarity index 100% rename from src/vkr_cs.c rename to src/venus/vkr_cs.c diff --git a/src/vkr_cs.h b/src/venus/vkr_cs.h similarity index 100% rename from src/vkr_cs.h rename to src/venus/vkr_cs.h diff --git a/src/vkr_object.h b/src/venus/vkr_object.h similarity index 100% rename from src/vkr_object.h rename to src/venus/vkr_object.h diff --git a/src/vkr_renderer.c b/src/venus/vkr_renderer.c similarity index 100% rename from src/vkr_renderer.c rename to src/venus/vkr_renderer.c diff --git a/src/vkr_renderer.h b/src/venus/vkr_renderer.h similarity index 100% rename from src/vkr_renderer.h rename to src/venus/vkr_renderer.h diff --git a/src/vkr_ring.c b/src/venus/vkr_ring.c similarity index 100% rename from src/vkr_ring.c rename to src/venus/vkr_ring.c diff --git a/src/vkr_ring.h b/src/venus/vkr_ring.h similarity index 100% rename from src/vkr_ring.h rename to src/venus/vkr_ring.h