Skip to content

Add opt-in MT-safety support; refactor existing interfaces; address v… #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DominikWitczakAMD merged 1 commit into from
Jan 24, 2018
Merged

Add opt-in MT-safety support; refactor existing interfaces; address v… #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@ option(ANVIL_LINK_WITH_GLSLANG "Links with glslang, instead
# Do not modify anything after this line, unless you know what you're doing.
configure_file("include/config.h.in" "${Anvil_SOURCE_DIR}/include/config.h")

include_directories("$(Anvil_SOURCE_DIR)/deps"
include_directories("$(Anvil_SOURCE_DIR)"
"$(Anvil_SOURCE_DIR)/deps"
"$(Anvil_SOURCE_DIR)/include")

if (WIN32)
include_directories($ENV{VK_SDK_PATH}/Include
$ENV{VULKAN_SDK}/Include)

if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
link_directories ($ENV{VK_SDK_PATH}/Bin
$ENV{VK_SDK_PATH}/Lib
Expand All @@ -28,30 +26,33 @@ if (WIN32)
$ENV{VULKAN_SDK}/Lib32)
endif()
else()
include_directories($ENV{VK_SDK_PATH}/x86_64/include
$ENV{VULKAN_SDK}/include
$ENV{VULKAN_SDK}/x86_64/include)
link_directories ($ENV{VK_SDK_PATH}/x86_64/lib
$ENV{VULKAN_SDK}/lib
$ENV{VULKAN_SDK}/x86_64/lib)
endif()

SET (SRC_LIST "${Anvil_SOURCE_DIR}/include/misc/memalloc_backends/backend_oneshot.h"
"${Anvil_SOURCE_DIR}/include/misc/memalloc_backends/backend_vma.h"
"${Anvil_SOURCE_DIR}/include/misc/base_pipeline_info.h"
"${Anvil_SOURCE_DIR}/include/misc/base_pipeline_manager.h"
"${Anvil_SOURCE_DIR}/include/misc/callbacks.h"
"${Anvil_SOURCE_DIR}/include/misc/compute_pipeline_info.h"
"${Anvil_SOURCE_DIR}/include/misc/debug.h"
"${Anvil_SOURCE_DIR}/include/misc/debug_marker.h"
"${Anvil_SOURCE_DIR}/include/misc/descriptor_set_info.h"
"${Anvil_SOURCE_DIR}/include/misc/dummy_window.h"
"${Anvil_SOURCE_DIR}/include/misc/formats.h"
"${Anvil_SOURCE_DIR}/include/misc/fp16.h"
"${Anvil_SOURCE_DIR}/include/misc/glsl_to_spirv.h"
"${Anvil_SOURCE_DIR}/include/misc/graphics_pipeline_info.h"
"${Anvil_SOURCE_DIR}/include/misc/io.h"
"${Anvil_SOURCE_DIR}/include/misc/memory_allocator.h"
"${Anvil_SOURCE_DIR}/include/misc/mt_safety.h"
"${Anvil_SOURCE_DIR}/include/misc/object_tracker.h"
"${Anvil_SOURCE_DIR}/include/misc/page_tracker.h"
"${Anvil_SOURCE_DIR}/include/misc/pools.h"
"${Anvil_SOURCE_DIR}/include/misc/ref_counter.h"
"${Anvil_SOURCE_DIR}/include/misc/render_pass_info.h"
"${Anvil_SOURCE_DIR}/include/misc/shader_module_cache.h"
"${Anvil_SOURCE_DIR}/include/misc/time.h"
"${Anvil_SOURCE_DIR}/include/misc/types.h"
Expand Down Expand Up @@ -90,18 +91,23 @@ SET (SRC_LIST "${Anvil_SOURCE_DIR}/include/misc/memalloc_backends/backend_onesho

"${Anvil_SOURCE_DIR}/src/misc/memalloc_backends/backend_oneshot.cpp"
"${Anvil_SOURCE_DIR}/src/misc/memalloc_backends/backend_vma.cpp"
"${Anvil_SOURCE_DIR}/src/misc/base_pipeline_info.cpp"
"${Anvil_SOURCE_DIR}/src/misc/base_pipeline_manager.cpp"
"${Anvil_SOURCE_DIR}/src/misc/compute_pipeline_info.cpp"
"${Anvil_SOURCE_DIR}/src/misc/debug.cpp"
"${Anvil_SOURCE_DIR}/src/misc/debug_marker.cpp"
"${Anvil_SOURCE_DIR}/src/misc/descriptor_set_info.cpp"
"${Anvil_SOURCE_DIR}/src/misc/dummy_window.cpp"
"${Anvil_SOURCE_DIR}/src/misc/formats.cpp"
"${Anvil_SOURCE_DIR}/src/misc/fp16.cpp"
"${Anvil_SOURCE_DIR}/src/misc/glsl_to_spirv.cpp"
"${Anvil_SOURCE_DIR}/src/misc/graphics_pipeline_info.cpp"
"${Anvil_SOURCE_DIR}/src/misc/io.cpp"
"${Anvil_SOURCE_DIR}/src/misc/memory_allocator.cpp"
"${Anvil_SOURCE_DIR}/src/misc/object_tracker.cpp"
"${Anvil_SOURCE_DIR}/src/misc/page_tracker.cpp"
"${Anvil_SOURCE_DIR}/src/misc/pools.cpp"
"${Anvil_SOURCE_DIR}/src/misc/render_pass_info.cpp"
"${Anvil_SOURCE_DIR}/src/misc/shader_module_cache.cpp"
"${Anvil_SOURCE_DIR}/src/misc/time.cpp"
"${Anvil_SOURCE_DIR}/src/misc/types.cpp"
Expand Down
2 changes: 0 additions & 2 deletions deps/VulkanMemoryAllocator/vk_mem_alloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1486,8 +1486,6 @@ template<typename T, typename AllocatorT>
class VmaList
{
public:
class const_iterator;

class iterator
{
public:
Expand Down
6 changes: 3 additions & 3 deletions examples/DynamicBuffers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ endif()

# Create the DynamicBuffers project.
add_executable (DynamicBuffers include/app.h
include/app.h
src/app.cpp)
include/app.h
src/app.cpp)

# Add linking dependencies for the example projects
add_dependencies(DynamicBuffers Anvil)
add_dependencies (DynamicBuffers Anvil)

if (WIN32)
target_link_libraries(DynamicBuffers Anvil)
Expand Down
4 changes: 2 additions & 2 deletions examples/DynamicBuffers/include/app.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ class App
std::shared_ptr<Anvil::ShaderModuleStageEntryPoint> m_consumer_vs_ptr;
std::shared_ptr<Anvil::ShaderModuleStageEntryPoint> m_producer_cs_ptr;

Anvil::GraphicsPipelineID m_consumer_pipeline_id;
Anvil::PipelineID m_consumer_pipeline_id;
std::shared_ptr<Anvil::RenderPass> m_consumer_render_pass_ptr;
Anvil::ComputePipelineID m_producer_pipeline_id;
Anvil::PipelineID m_producer_pipeline_id;

std::shared_ptr<Anvil::PrimaryCommandBuffer> m_command_buffers [N_SWAPCHAIN_IMAGES];
std::shared_ptr<Anvil::Image> m_depth_images [N_SWAPCHAIN_IMAGES];
Expand Down
Loading