Skip to content

Commit

Permalink
Switched to #include-quotes style instead of #include-angle-brackets …
Browse files Browse the repository at this point in the history
…for all the Auto-Vk headers. (#81)
  • Loading branch information
johannesugb committed May 22, 2023
1 parent 54d5611 commit ff0a882
Show file tree
Hide file tree
Showing 64 changed files with 147 additions and 147 deletions.
2 changes: 1 addition & 1 deletion include/avk/acceleration_structure_size_requirements.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

namespace avk
{
Expand Down
26 changes: 13 additions & 13 deletions include/avk/attachment.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

namespace avk
{
Expand Down Expand Up @@ -60,26 +60,26 @@ namespace avk
*/
static attachment declare_for(const image_view_t& aImageView, attachment_load_config aLoadOp, subpass_usages aUsageInSubpasses, attachment_store_config aStoreOp);

attachment& set_clear_color(std::array<float, 4> aColor) { mColorClearValue = aColor; return *this; }
attachment& set_depth_clear_value(float aDepthClear) { mDepthClearValue = aDepthClear; return *this; }
attachment& set_stencil_clear_value(uint32_t aStencilClear) { mStencilClearValue = aStencilClear; return *this; }
attachment& set_load_operation(attachment_load_config aLoadOp) { mLoadOperation = aLoadOp; return *this; }
attachment& set_store_operation(attachment_store_config aStoreOp) { mStoreOperation = aStoreOp; return *this; }
attachment& set_stencil_load_operation(attachment_load_config aLoadOp) { mStencilLoadOperation = aLoadOp; return *this; }
attachment& set_stencil_store_operation(attachment_store_config aStoreOp) { mStencilStoreOperation = aStoreOp; return *this; }
attachment& set_clear_color(std::array<float, 4> aColor) { mColorClearValue = aColor; return *this; }
attachment& set_depth_clear_value(float aDepthClear) { mDepthClearValue = aDepthClear; return *this; }
attachment& set_stencil_clear_value(uint32_t aStencilClear) { mStencilClearValue = aStencilClear; return *this; }

attachment& set_load_operation(attachment_load_config aLoadOp) { mLoadOperation = aLoadOp; return *this; }
attachment& set_store_operation(attachment_store_config aStoreOp) { mStoreOperation = aStoreOp; return *this; }
attachment& set_stencil_load_operation(attachment_load_config aLoadOp) { mStencilLoadOperation = aLoadOp; return *this; }
attachment& set_stencil_store_operation(attachment_store_config aStoreOp) { mStencilStoreOperation = aStoreOp; return *this; }

/** The color/depth/stencil format of the attachment */
auto format() const { return mFormat; }

auto get_first_color_depth_input() const { return mSubpassUsages.first_color_depth_input_usage(); }

auto get_last_color_depth_input() const { return mSubpassUsages.last_color_depth_input_usage(); }

auto is_used_as_depth_stencil_attachment() const { return mSubpassUsages.contains_depth_stencil(); }

auto is_used_as_color_attachment() const { return mSubpassUsages.contains_color(); }

auto is_used_as_input_attachment() const { return mSubpassUsages.contains_input(); }

/** True if the sample count is greater than 1 */
Expand Down
144 changes: 72 additions & 72 deletions include/avk/avk.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
#include <concepts>
#include <ranges>

#include <avk/avk_log.hpp>
#include <avk/avk_error.hpp>
#include <avk/cpp_utils.hpp>
#include "avk/avk_log.hpp"
#include "avk/avk_error.hpp"
#include "avk/cpp_utils.hpp"

// TODO: #include <vulkan/vulkan_core.h> => #if VK_HEADER_VERSION >= 162
#define VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL 0
Expand All @@ -49,7 +49,7 @@
*
* By default, such a staging buffer is created with avk::memory_usage::host_coherent
* if nothing else is specified. Feel free to specify a different value by defining
* the AVK_STAGING_BUFFER_MEMORY_USAGE macro before the #include <avk/avk.hpp>.
* the AVK_STAGING_BUFFER_MEMORY_USAGE macro before the #include "avk/avk.hpp".
* Note, however, that host-visibility MUST be given, otherwise nothing will work anymore.
*/
#if !defined(AVK_STAGING_BUFFER_MEMORY_USAGE)
Expand All @@ -64,7 +64,7 @@
*
* By default, such a staging buffer is created with avk::memory_usage::host_visible
* if nothing else is specified. Feel free to specify a different value by defining
* the AVK_STAGING_BUFFER_READBACK_MEMORY_USAGE macro before the #include <avk/avk.hpp>.
* the AVK_STAGING_BUFFER_READBACK_MEMORY_USAGE macro before the #include "avk/avk.hpp".
* Note, however, that host-visibility MUST be given, otherwise nothing will work anymore.
*/
#if !defined(AVK_STAGING_BUFFER_READBACK_MEMORY_USAGE)
Expand All @@ -76,14 +76,14 @@ namespace avk
class root;
}

#include <avk/image_color_channel_order.hpp>
#include <avk/image_color_channel_format.hpp>
#include <avk/image_usage.hpp>
#include <avk/filter_mode.hpp>
#include <avk/border_handling_mode.hpp>
#include "avk/image_color_channel_order.hpp"
#include "avk/image_color_channel_format.hpp"
#include "avk/image_usage.hpp"
#include "avk/filter_mode.hpp"
#include "avk/border_handling_mode.hpp"

#include <avk/vk_utils.hpp>
#include <avk/mapping_access.hpp>
#include "avk/vk_utils.hpp"
#include "avk/mapping_access.hpp"

/** CONFIG SETTING: DISPATCH_LOADER_CORE_TYPE
*
Expand All @@ -108,7 +108,7 @@ namespace avk
/** CONFIG SETTING: AVK_USE_VMA
*
* Define the macro AVK_USE_VMA to enable memory allocation via Vulkan Memory Allocator.
* Note 1: You'll have to #define AVK_USE_VMA before the #include <avk/avk.hpp> statement!
* Note 1: You'll have to #define AVK_USE_VMA before the #include "avk/avk.hpp" statement!
* Note 2: Vulkan Memory Allocator is not enabled by default. By default, you'll get
* a very straight-forward and unoptimized memory allocation behavior, where
* one memory allocation is made per resource.
Expand All @@ -126,12 +126,12 @@ namespace avk
#if !defined(AVK_MEM_BUFFER_HANDLE)
#define AVK_MEM_BUFFER_HANDLE avk::vma_handle<vk::Buffer>
#endif
#include <avk/vma_handle.hpp>
#include "avk/vma_handle.hpp"
#else
#include <avk/mem_handle.hpp>
#include "avk/mem_handle.hpp"
#endif

#include <avk/scoped_mapping.hpp>
#include "avk/scoped_mapping.hpp"

/** CONFIG SETTINGS: AVK_MEM_ALLOCATOR_TYPE, AVK_MEM_IMAGE_HANDLE, AVK_MEM_BUFFER_HANDLE
*
Expand All @@ -140,7 +140,7 @@ namespace avk
* similar to avk::mem_handle or avk::vma_handle which manages memory allocations.
*
* If you want to plug-in custom memory allocation behavior, define ALL THREE of these
* macros before the #include <avk/avk.hpp>
* macros before the #include "avk/avk.hpp"
*
* The default for these macros is "stupid" memory allocation behavior by the means of
* mem_handle which creates one memory allocation per resource. If the AVK_USE_VMA macro
Expand All @@ -157,31 +157,31 @@ namespace avk
#define AVK_MEM_BUFFER_HANDLE avk::mem_handle<vk::Buffer>
#endif

#include <avk/memory_access.hpp>
#include <avk/memory_usage.hpp>
#include <avk/layout.hpp>
#include <avk/on_load.hpp>
#include <avk/on_store.hpp>
#include <avk/subpass_usage_type.hpp>
#include <avk/subpass_usages.hpp>
#include "avk/memory_access.hpp"
#include "avk/memory_usage.hpp"
#include "avk/layout.hpp"
#include "avk/on_load.hpp"
#include "avk/on_store.hpp"
#include "avk/subpass_usage_type.hpp"
#include "avk/subpass_usages.hpp"

#include <avk/shader_type.hpp>
#include <avk/pipeline_stage.hpp>
#include <avk/stage_and_access.hpp>
#include "avk/shader_type.hpp"
#include "avk/pipeline_stage.hpp"
#include "avk/stage_and_access.hpp"

#include <avk/descriptor_alloc_request.hpp>
#include <avk/descriptor_pool.hpp>
#include "avk/descriptor_alloc_request.hpp"
#include "avk/descriptor_pool.hpp"


#include <avk/format_for.hpp>
#include <avk/buffer_meta.hpp>
#include "avk/format_for.hpp"
#include "avk/buffer_meta.hpp"

#include <avk/binding_data.hpp>
#include "avk/binding_data.hpp"

#include <avk/descriptor_set.hpp>
#include <avk/descriptor_set_layout.hpp>
#include <avk/set_of_descriptor_set_layouts.hpp>
#include <avk/descriptor_cache.hpp>
#include "avk/descriptor_set.hpp"
#include "avk/descriptor_set_layout.hpp"
#include "avk/set_of_descriptor_set_layouts.hpp"
#include "avk/descriptor_cache.hpp"

// Predefine command types:
namespace avk
Expand All @@ -197,56 +197,56 @@ namespace avk
}
}

#include <avk/buffer.hpp>
#include <avk/shader_info.hpp>
#include "avk/buffer.hpp"
#include "avk/shader_info.hpp"

#include <avk/shader_binding_table.hpp>
#include <avk/command_buffer.hpp>
#include <avk/command_pool.hpp>
#include "avk/shader_binding_table.hpp"
#include "avk/command_buffer.hpp"
#include "avk/command_pool.hpp"

#include <avk/semaphore.hpp>
#include <avk/fence.hpp>
#include "avk/semaphore.hpp"
#include "avk/fence.hpp"

#include <avk/image.hpp>
#include <avk/image_view.hpp>
#include <avk/sampler.hpp>
#include <avk/image_sampler.hpp>
#include <avk/attachment.hpp>
#include "avk/image.hpp"
#include "avk/image_view.hpp"
#include "avk/sampler.hpp"
#include "avk/image_sampler.hpp"
#include "avk/attachment.hpp"

#include <avk/input_description.hpp>
#include <avk/push_constants.hpp>
#include "avk/input_description.hpp"
#include "avk/push_constants.hpp"


#include <avk/buffer_view.hpp>
#include <avk/vertex_index_buffer_pair.hpp>
#include <avk/subpass_dependency.hpp>
#include <avk/renderpass.hpp>
#include <avk/framebuffer.hpp>
#include "avk/buffer_view.hpp"
#include "avk/vertex_index_buffer_pair.hpp"
#include "avk/subpass_dependency.hpp"
#include "avk/renderpass.hpp"
#include "avk/framebuffer.hpp"

#include <avk/geometry_instance.hpp>
#include "avk/geometry_instance.hpp"

#include <avk/vk_utils2.hpp>
#include "avk/vk_utils2.hpp"

#include <avk/acceleration_structure_size_requirements.hpp>
#include <avk/bottom_level_acceleration_structure.hpp>
#include <avk/top_level_acceleration_structure.hpp>
#include <avk/shader.hpp>
#include "avk/acceleration_structure_size_requirements.hpp"
#include "avk/bottom_level_acceleration_structure.hpp"
#include "avk/top_level_acceleration_structure.hpp"
#include "avk/shader.hpp"

#include <avk/graphics_pipeline_config.hpp>
#include <avk/compute_pipeline_config.hpp>
#include <avk/ray_tracing_pipeline_config.hpp>
#include <avk/graphics_pipeline.hpp>
#include <avk/compute_pipeline.hpp>
#include <avk/ray_tracing_pipeline.hpp>
#include "avk/graphics_pipeline_config.hpp"
#include "avk/compute_pipeline_config.hpp"
#include "avk/ray_tracing_pipeline_config.hpp"
#include "avk/graphics_pipeline.hpp"
#include "avk/compute_pipeline.hpp"
#include "avk/ray_tracing_pipeline.hpp"

#include <avk/query_pool.hpp>
#include "avk/query_pool.hpp"

#include <avk/vulkan_helper_functions.hpp>
#include "avk/vulkan_helper_functions.hpp"

#include <avk/bindings.hpp>
#include "avk/bindings.hpp"

#include <avk/commands.hpp>
#include <avk/queue.hpp>
#include "avk/commands.hpp"
#include "avk/queue.hpp"

namespace avk
{
Expand Down
2 changes: 1 addition & 1 deletion include/avk/binding_data.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

namespace avk
{
Expand Down
2 changes: 1 addition & 1 deletion include/avk/bindings.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"
#include <type_traits>

namespace avk
Expand Down
2 changes: 1 addition & 1 deletion include/avk/border_handling_mode.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

namespace avk
{
Expand Down
2 changes: 1 addition & 1 deletion include/avk/bottom_level_acceleration_structure.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

namespace avk
{
Expand Down
2 changes: 1 addition & 1 deletion include/avk/buffer.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

namespace avk
{
Expand Down
2 changes: 1 addition & 1 deletion include/avk/buffer_meta.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

namespace avk
{
Expand Down
2 changes: 1 addition & 1 deletion include/avk/buffer_view.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

namespace avk
{
Expand Down
2 changes: 1 addition & 1 deletion include/avk/command_buffer.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

#include "avk.hpp"

Expand Down
2 changes: 1 addition & 1 deletion include/avk/command_pool.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

namespace avk
{
Expand Down
2 changes: 1 addition & 1 deletion include/avk/commands.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

#include "buffer.hpp"
#include "image.hpp"
Expand Down
2 changes: 1 addition & 1 deletion include/avk/compute_pipeline.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

namespace avk
{
Expand Down
2 changes: 1 addition & 1 deletion include/avk/compute_pipeline_config.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

namespace avk
{
Expand Down
2 changes: 1 addition & 1 deletion include/avk/descriptor_alloc_request.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

namespace avk
{
Expand Down
2 changes: 1 addition & 1 deletion include/avk/descriptor_cache.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

namespace avk
{
Expand Down
2 changes: 1 addition & 1 deletion include/avk/descriptor_pool.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

namespace avk
{
Expand Down
2 changes: 1 addition & 1 deletion include/avk/descriptor_set.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <avk/avk.hpp>
#include "avk/avk.hpp"

namespace avk
{
Expand Down
Loading

0 comments on commit ff0a882

Please sign in to comment.