Skip to content

Major update #61

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 4 commits into from
Mar 13, 2018
Merged

Major update #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33f4940
Major update.
DominikWitczakAMD Mar 12, 2018
dcca386
Fix config.h issues
DominikWitczakAMD Mar 12, 2018
0c2b704
gcc issues
DominikWitczakAMD Mar 12, 2018
1d5d2c3
gcc fixes
DominikWitczakAMD Mar 13, 2018
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
12 changes: 10 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ 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")
configure_file("include/config.h.in" "include/config.h")

include_directories("$(Anvil_SOURCE_DIR)"
"$(Anvil_SOURCE_DIR)/deps"
"$(Anvil_SOURCE_DIR)/include")
"$(Anvil_SOURCE_DIR)/include"
"${Anvil_BINARY_DIR}/include")

if (WIN32)
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
Expand Down Expand Up @@ -54,6 +55,7 @@ SET (SRC_LIST "${Anvil_SOURCE_DIR}/include/misc/memalloc_backends/backend_onesho
"${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/struct_chainer.h"
"${Anvil_SOURCE_DIR}/include/misc/time.h"
"${Anvil_SOURCE_DIR}/include/misc/types.h"
"${Anvil_SOURCE_DIR}/include/misc/window.h"
Expand All @@ -67,6 +69,8 @@ SET (SRC_LIST "${Anvil_SOURCE_DIR}/include/misc/memalloc_backends/backend_onesho
"${Anvil_SOURCE_DIR}/include/wrappers/descriptor_set.h"
"${Anvil_SOURCE_DIR}/include/wrappers/descriptor_set_group.h"
"${Anvil_SOURCE_DIR}/include/wrappers/descriptor_set_layout.h"
"${Anvil_SOURCE_DIR}/include/wrappers/descriptor_set_layout_manager.h"
"${Anvil_SOURCE_DIR}/include/wrappers/descriptor_update_template.h"
"${Anvil_SOURCE_DIR}/include/wrappers/device.h"
"${Anvil_SOURCE_DIR}/include/wrappers/event.h"
"${Anvil_SOURCE_DIR}/include/wrappers/fence.h"
Expand Down Expand Up @@ -122,6 +126,8 @@ SET (SRC_LIST "${Anvil_SOURCE_DIR}/include/misc/memalloc_backends/backend_onesho
"${Anvil_SOURCE_DIR}/src/wrappers/descriptor_set.cpp"
"${Anvil_SOURCE_DIR}/src/wrappers/descriptor_set_group.cpp"
"${Anvil_SOURCE_DIR}/src/wrappers/descriptor_set_layout.cpp"
"${Anvil_SOURCE_DIR}/src/wrappers/descriptor_set_layout_manager.cpp"
"${Anvil_SOURCE_DIR}/src/wrappers/descriptor_update_template.cpp"
"${Anvil_SOURCE_DIR}/src/wrappers/device.cpp"
"${Anvil_SOURCE_DIR}/src/wrappers/event.cpp"
"${Anvil_SOURCE_DIR}/src/wrappers/fence.cpp"
Expand Down Expand Up @@ -189,8 +195,10 @@ endif()
# Add dependendencies
if (WIN32)
add_subdirectory("deps\\glslang")
add_subdirectory("deps\\glslang\\OGLCompilersDLL")
else()
add_subdirectory("deps/glslang")
add_subdirectory("deps/glslang/OGLCompilersDLL")
endif()

# Enable level-4 warnings
Expand Down
1 change: 0 additions & 1 deletion deps/glslang/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ endfunction(glslang_set_link_args)
add_subdirectory(External)

add_subdirectory(glslang)
add_subdirectory(OGLCompilersDLL)
if(ENABLE_GLSLANG_BINARIES)
add_subdirectory(StandAlone)
endif()
Expand Down
1 change: 0 additions & 1 deletion examples/DynamicBuffers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ endif()

add_subdirectory (../.. "${CMAKE_CURRENT_BINARY_DIR}/anvil")


include_directories(${Anvil_SOURCE_DIR}/include
${DynamicBuffers_SOURCE_DIR}/include)

Expand Down
74 changes: 37 additions & 37 deletions examples/DynamicBuffers/include/app.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,45 +66,45 @@ class App
uint32_t* out_opt_offset_data_offset_ptr = nullptr);

/* Private variables */
std::weak_ptr<Anvil::SGPUDevice> m_device_ptr;
std::shared_ptr<Anvil::Instance> m_instance_ptr;
std::weak_ptr<Anvil::PhysicalDevice> m_physical_device_ptr;
std::shared_ptr<Anvil::Queue> m_present_queue_ptr;
std::shared_ptr<Anvil::RenderingSurface> m_rendering_surface_ptr;
std::shared_ptr<Anvil::Swapchain> m_swapchain_ptr;
Anvil::Time m_time;
std::shared_ptr<Anvil::Window> m_window_ptr;

std::shared_ptr<Anvil::DescriptorSetGroup> m_consumer_dsg_ptr;
std::shared_ptr<Anvil::DescriptorSetGroup> m_producer_dsg_ptr;

std::shared_ptr<Anvil::ShaderModuleStageEntryPoint> m_consumer_fs_ptr;
std::shared_ptr<Anvil::ShaderModuleStageEntryPoint> m_consumer_vs_ptr;
std::shared_ptr<Anvil::ShaderModuleStageEntryPoint> m_producer_cs_ptr;

Anvil::PipelineID m_consumer_pipeline_id;
std::shared_ptr<Anvil::RenderPass> m_consumer_render_pass_ptr;
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];
std::shared_ptr<Anvil::ImageView> m_depth_image_views[N_SWAPCHAIN_IMAGES];
std::shared_ptr<Anvil::Framebuffer> m_fbos [N_SWAPCHAIN_IMAGES];

std::shared_ptr<Anvil::Buffer> m_sine_color_buffer_ptr; /* N_SINE_PAIRS * 2 * vec2; data stored as R8G8_UNORM */
VkDeviceSize m_sine_color_buffer_size;
std::shared_ptr<Anvil::Buffer> m_sine_data_buffer_ptr;
std::vector<VkDeviceSize> m_sine_data_buffer_offsets;
VkDeviceSize m_sine_data_buffer_size;
std::shared_ptr<Anvil::Buffer> m_sine_offset_data_buffer_ptr;
std::vector<VkDeviceSize> m_sine_offset_data_buffer_offsets;
VkDeviceSize m_sine_offset_data_buffer_size;
std::shared_ptr<Anvil::Buffer> m_sine_props_data_buffer_ptr;
VkDeviceSize m_sine_props_data_buffer_size_per_swapchain_image;
Anvil::SGPUDeviceUniquePtr m_device_ptr;
Anvil::InstanceUniquePtr m_instance_ptr;
const Anvil::PhysicalDevice* m_physical_device_ptr;
Anvil::Queue* m_present_queue_ptr;
Anvil::RenderingSurfaceUniquePtr m_rendering_surface_ptr;
Anvil::SwapchainUniquePtr m_swapchain_ptr;
Anvil::Time m_time;
Anvil::WindowUniquePtr m_window_ptr;

Anvil::DescriptorSetGroupUniquePtr m_consumer_dsg_ptr;
Anvil::DescriptorSetGroupUniquePtr m_producer_dsg_ptr;

std::unique_ptr<Anvil::ShaderModuleStageEntryPoint> m_consumer_fs_ptr;
std::unique_ptr<Anvil::ShaderModuleStageEntryPoint> m_consumer_vs_ptr;
std::unique_ptr<Anvil::ShaderModuleStageEntryPoint> m_producer_cs_ptr;

Anvil::PipelineID m_consumer_pipeline_id;
Anvil::RenderPassUniquePtr m_consumer_render_pass_ptr;
Anvil::PipelineID m_producer_pipeline_id;

Anvil::PrimaryCommandBufferUniquePtr m_command_buffers [N_SWAPCHAIN_IMAGES];
Anvil::ImageUniquePtr m_depth_images [N_SWAPCHAIN_IMAGES];
Anvil::ImageViewUniquePtr m_depth_image_views[N_SWAPCHAIN_IMAGES];
Anvil::FramebufferUniquePtr m_fbos [N_SWAPCHAIN_IMAGES];

Anvil::BufferUniquePtr m_sine_color_buffer_ptr; /* N_SINE_PAIRS * 2 * vec2; data stored as R8G8_UNORM */
VkDeviceSize m_sine_color_buffer_size;
Anvil::BufferUniquePtr m_sine_data_buffer_ptr;
std::vector<VkDeviceSize> m_sine_data_buffer_offsets;
VkDeviceSize m_sine_data_buffer_size;
Anvil::BufferUniquePtr m_sine_offset_data_buffer_ptr;
std::vector<VkDeviceSize> m_sine_offset_data_buffer_offsets;
VkDeviceSize m_sine_offset_data_buffer_size;
Anvil::BufferUniquePtr m_sine_props_data_buffer_ptr;
VkDeviceSize m_sine_props_data_buffer_size_per_swapchain_image;

uint32_t m_n_last_semaphore_used;
const uint32_t m_n_swapchain_images;

std::vector<std::shared_ptr<Anvil::Semaphore> > m_frame_signal_semaphores;
std::vector<std::shared_ptr<Anvil::Semaphore> > m_frame_wait_semaphores;
std::vector<Anvil::SemaphoreUniquePtr> m_frame_signal_semaphores;
std::vector<Anvil::SemaphoreUniquePtr> m_frame_wait_semaphores;
};
Loading