Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • vulkan2021/vkcv-framework
1 result
Select Git revision
Show changes
......@@ -14,6 +14,7 @@ target_include_directories(rt_ambient_occlusion SYSTEM BEFORE PRIVATE
${vkcv_includes}
${vkcv_asset_loader_include}
${vkcv_camera_include}
${vkcv_denoising_include}
${vkcv_gui_include}
${vkcv_scene_include}
${vkcv_shader_compiler_include}
......@@ -25,6 +26,7 @@ target_link_libraries(rt_ambient_occlusion
vkcv ${vkcv_libraries}
vkcv_asset_loader ${vkcv_asset_loader_libraries}
vkcv_camera
vkcv_denoising
vkcv_gui
vkcv_scene
vkcv_shader_compiler
......
#include <vkcv/Core.hpp>
#include <vkcv/camera/CameraManager.hpp>
#include <vkcv/denoising/ReflectionDenoiser.hpp>
#include <vkcv/denoising/ShadowDenoiser.hpp>
#include <vkcv/gui/GUI.hpp>
#include <vkcv/shader/GLSLCompiler.hpp>
#include <vkcv/scene/Scene.hpp>
......@@ -166,6 +168,8 @@ int main(int argc, const char** argv) {
core.writeDescriptorSet(descriptorSetHandles[0], writes);
}
vkcv::denoising::ReflectionDenoiser den (core);
vkcv::denoising::ShadowDenoiser denoiser (core);
vkcv::upscaling::FSRUpscaling upscaling (core);
uint32_t fsrWidth = core.getWindow(windowHandle).getWidth();
......@@ -290,6 +294,10 @@ int main(int argc, const char** argv) {
windowHandle
);
core.prepareImageForStorage(cmdStream, colorBuffer);
denoiser.recordDenoising(cmdStream, colorBuffer, colorBuffer);
core.prepareImageForSampling(cmdStream, colorBuffer);
core.prepareImageForStorage(cmdStream, swapchainInput);
......
......@@ -5,6 +5,7 @@
#include "BufferManager.hpp"
#include "vkcv/Core.hpp"
#include <vkcv/Handles.hpp>
#include <vkcv/Logger.hpp>
#include <limits>
......@@ -118,8 +119,8 @@ namespace vkcv {
}
BufferHandle BufferManager::createBuffer(const TypeGuard &typeGuard, BufferType type,
BufferMemoryType memoryType, size_t size,
bool readable, size_t alignment) {
BufferMemoryType memoryType, size_t size,
bool readable, size_t alignment) {
vk::BufferCreateFlags createFlags;
vk::BufferUsageFlags usageFlags;
......@@ -181,6 +182,10 @@ namespace vkcv {
const vma::Allocator &allocator = getCore().getContext().getAllocator();
if (0 == size) {
vkcv_log(LogLevel::WARNING, "Invalid buffer size");
}
vma::MemoryUsage memoryUsage;
bool mappable;
......