claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
procedural-3d-engine/examples/shadowmappingomni/shadowmappingomni.cpp

815 lines
32 KiB
C++
Raw Normal View History

Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
/*
* Vulkan Example - Omni directional shadows using a dynamic cube map
*
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
* Copyright (C) by Sascha Willems - www.saschawillems.de
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
*
* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
*/
#include "vulkanexamplebase.h"
Merge glTF branch (#747) * Added helper function for easy pipeline vertex input state create info structure setup from glTF model vertex class * Split glTF loader into header and implementation * Updated sample to use glTF * Removed collada files Replaced assets are now part of the asset pack * Return value for glTF model vertex input state create info helper * Removed unused assets * Use glTF assets * Added default material for glTF node's without materials * Use glTF assets * Apply pre-transforms to normals * Use glTF assets * Use glTF assets * Use vertex input state from glTF model class * Scene setup * Use glTF assets * Use glTF assets * Display error message and exit if glTF file could not be loaded * Use glTF assets * Use glTF assets * Use glTF assets * Remove unused buffer binds * Use glTF assets * Remove no longer used model files * Remove no longer used model files * Added support for rendering glTF models with images * glTF model normal pre-transform ignores translation * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Only add combined image samplers to pool if actually used in the scene * Use global descriptor set layouts * Use global descriptor set layouts * Use glTF assets * Use glTF assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Remove no-longer used model * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used model * Use glTF assets Code cleanup Use RGBA texture instead of different compressed formats Removed no-longer used assets * Adnrdoid build file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders * Added vertex count and way of passing additional memory property type flags to glTF loader * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders * Remove unfinished sample * Completely reworked push constants sample Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Android CMake build files * Removed un-used asset * Explicit buffer binding function * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Removed no-longer used assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used assets * Remove no-longer used asset * Use glTF assets Code cleanup and refactoring Performance optimizations Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Pass vertex size and calculate multiplier in shaders instead of hard-coding With this, changes to the glTF vertex structure won't break the ray tracing samples * Load tangents (if present) * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code * Android build * Normal mapping fixes Udpated HLSL shaders * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Code cleanup, comments * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Added sample count to framebuffer create info * Removed no-longer used assets * Android build Removed no-longer used assets * Code cleanup and heavy refactoring Updated GLSL and HLSL shaders Use tangents stored in GLSL instead of calculating them in the fragment shader * Renamed textured PBR sample main cpp file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Removed no-longer used assets * Android build files * Android build files * Use glTF assets Removed no-longer used assets * Fixed HLSL shaders * Android build files * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Added flag to disable glTF image loading Useful for samples that use their own textures or don't use textures at all to speed up loading * Use glTF assets Code cleanup Use Sponza scene instead of Sibenik to better highlight the effect Updated GLSL and HLSL shaders * Updated Android build files * Removed left-over comment * Use Sponza scene for the SSAO sample * Removed unused code * Removed ASSIMP No longer required as all samples now use the glTF file format * Added missing vertex shader stage * Removed old ASSIMP-based model loader * Added support for loading external glTF images from ktx Android fixes for loading external buffer files * Scene setup * Added missing shader stages * Removed ASSIMP from build files * Fixed compiler warning * Removed ASSIMP from readmes * Android build files cleanup * Replaced ktx submodule with only the files required for this repo The ktx submodule was a tad too big and contained lots of files not required for this repo * Moved ktx build files into base project * Use glTF assets * Use glTF assets * Removed license files, will be moved to asset pack * Use RGBA textures * Use RGBA cubemp texture with face assignment based on original images Refs #679 * Android build files * Removed textures All textures will be moved to the asset pack * Ignore asset folders * Removed font Fonts will be moved to the asset pack * Link to gltf asset pack * Updated gitignore * Android build file
2020-07-28 20:20:38 +02:00
#include "VulkanglTFModel.h"
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
#define ENABLE_VALIDATION false
// Texture properties
#define TEX_DIM 1024
#define TEX_FILTER VK_FILTER_LINEAR
// Offscreen frame buffer properties
#define FB_DIM TEX_DIM
Move shaders into glsl and hlsl directories Move `data/shaders` to `data/shaders/glsl` Move `data/hlsl` to `data/shaders/hlsl` Fix up shader paths in the cpp files to point to the new glsl location. `data/shaders/hlsl/compile.py` still overwrites the glsl .spv files (for now). Issue: #723
2020-05-29 16:08:53 +01:00
#define FB_COLOR_FORMAT VK_FORMAT_R32_SFLOAT
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
class VulkanExample : public VulkanExampleBase
{
public:
bool displayCubeMap = false;
float zNear = 0.1f;
float zFar = 1024.0f;
struct {
Merge glTF branch (#747) * Added helper function for easy pipeline vertex input state create info structure setup from glTF model vertex class * Split glTF loader into header and implementation * Updated sample to use glTF * Removed collada files Replaced assets are now part of the asset pack * Return value for glTF model vertex input state create info helper * Removed unused assets * Use glTF assets * Added default material for glTF node's without materials * Use glTF assets * Apply pre-transforms to normals * Use glTF assets * Use glTF assets * Use vertex input state from glTF model class * Scene setup * Use glTF assets * Use glTF assets * Display error message and exit if glTF file could not be loaded * Use glTF assets * Use glTF assets * Use glTF assets * Remove unused buffer binds * Use glTF assets * Remove no longer used model files * Remove no longer used model files * Added support for rendering glTF models with images * glTF model normal pre-transform ignores translation * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Only add combined image samplers to pool if actually used in the scene * Use global descriptor set layouts * Use global descriptor set layouts * Use glTF assets * Use glTF assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Remove no-longer used model * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used model * Use glTF assets Code cleanup Use RGBA texture instead of different compressed formats Removed no-longer used assets * Adnrdoid build file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders * Added vertex count and way of passing additional memory property type flags to glTF loader * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders * Remove unfinished sample * Completely reworked push constants sample Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Android CMake build files * Removed un-used asset * Explicit buffer binding function * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Removed no-longer used assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used assets * Remove no-longer used asset * Use glTF assets Code cleanup and refactoring Performance optimizations Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Pass vertex size and calculate multiplier in shaders instead of hard-coding With this, changes to the glTF vertex structure won't break the ray tracing samples * Load tangents (if present) * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code * Android build * Normal mapping fixes Udpated HLSL shaders * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Code cleanup, comments * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Added sample count to framebuffer create info * Removed no-longer used assets * Android build Removed no-longer used assets * Code cleanup and heavy refactoring Updated GLSL and HLSL shaders Use tangents stored in GLSL instead of calculating them in the fragment shader * Renamed textured PBR sample main cpp file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Removed no-longer used assets * Android build files * Android build files * Use glTF assets Removed no-longer used assets * Fixed HLSL shaders * Android build files * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Added flag to disable glTF image loading Useful for samples that use their own textures or don't use textures at all to speed up loading * Use glTF assets Code cleanup Use Sponza scene instead of Sibenik to better highlight the effect Updated GLSL and HLSL shaders * Updated Android build files * Removed left-over comment * Use Sponza scene for the SSAO sample * Removed unused code * Removed ASSIMP No longer required as all samples now use the glTF file format * Added missing vertex shader stage * Removed old ASSIMP-based model loader * Added support for loading external glTF images from ktx Android fixes for loading external buffer files * Scene setup * Added missing shader stages * Removed ASSIMP from build files * Fixed compiler warning * Removed ASSIMP from readmes * Android build files cleanup * Replaced ktx submodule with only the files required for this repo The ktx submodule was a tad too big and contained lots of files not required for this repo * Moved ktx build files into base project * Use glTF assets * Use glTF assets * Removed license files, will be moved to asset pack * Use RGBA textures * Use RGBA cubemp texture with face assignment based on original images Refs #679 * Android build files * Removed textures All textures will be moved to the asset pack * Ignore asset folders * Removed font Fonts will be moved to the asset pack * Link to gltf asset pack * Updated gitignore * Android build file
2020-07-28 20:20:38 +02:00
vkglTF::Model scene;
vkglTF::Model debugcube;
Removed old mesh loader, replaced with new model loader and vertex layout class in all examples (Refs #260)
2017-02-11 14:18:24 +01:00
} models;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
struct {
Moved VulkanBuffer to vks namespce (Refs #260)
2017-02-12 10:44:51 +01:00
vks::Buffer scene;
vks::Buffer offscreen;
Replaced vkTools::UniformData with newer vk::Buffer for uniform buffers, some renaming, small fixes and corrections
2016-12-24 12:48:01 +01:00
} uniformBuffers;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
struct {
glm::mat4 projection;
glm::mat4 model;
} uboVSquad;
Merge glTF branch (#747) * Added helper function for easy pipeline vertex input state create info structure setup from glTF model vertex class * Split glTF loader into header and implementation * Updated sample to use glTF * Removed collada files Replaced assets are now part of the asset pack * Return value for glTF model vertex input state create info helper * Removed unused assets * Use glTF assets * Added default material for glTF node's without materials * Use glTF assets * Apply pre-transforms to normals * Use glTF assets * Use glTF assets * Use vertex input state from glTF model class * Scene setup * Use glTF assets * Use glTF assets * Display error message and exit if glTF file could not be loaded * Use glTF assets * Use glTF assets * Use glTF assets * Remove unused buffer binds * Use glTF assets * Remove no longer used model files * Remove no longer used model files * Added support for rendering glTF models with images * glTF model normal pre-transform ignores translation * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Only add combined image samplers to pool if actually used in the scene * Use global descriptor set layouts * Use global descriptor set layouts * Use glTF assets * Use glTF assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Remove no-longer used model * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used model * Use glTF assets Code cleanup Use RGBA texture instead of different compressed formats Removed no-longer used assets * Adnrdoid build file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders * Added vertex count and way of passing additional memory property type flags to glTF loader * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders * Remove unfinished sample * Completely reworked push constants sample Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Android CMake build files * Removed un-used asset * Explicit buffer binding function * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Removed no-longer used assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used assets * Remove no-longer used asset * Use glTF assets Code cleanup and refactoring Performance optimizations Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Pass vertex size and calculate multiplier in shaders instead of hard-coding With this, changes to the glTF vertex structure won't break the ray tracing samples * Load tangents (if present) * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code * Android build * Normal mapping fixes Udpated HLSL shaders * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Code cleanup, comments * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Added sample count to framebuffer create info * Removed no-longer used assets * Android build Removed no-longer used assets * Code cleanup and heavy refactoring Updated GLSL and HLSL shaders Use tangents stored in GLSL instead of calculating them in the fragment shader * Renamed textured PBR sample main cpp file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Removed no-longer used assets * Android build files * Android build files * Use glTF assets Removed no-longer used assets * Fixed HLSL shaders * Android build files * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Added flag to disable glTF image loading Useful for samples that use their own textures or don't use textures at all to speed up loading * Use glTF assets Code cleanup Use Sponza scene instead of Sibenik to better highlight the effect Updated GLSL and HLSL shaders * Updated Android build files * Removed left-over comment * Use Sponza scene for the SSAO sample * Removed unused code * Removed ASSIMP No longer required as all samples now use the glTF file format * Added missing vertex shader stage * Removed old ASSIMP-based model loader * Added support for loading external glTF images from ktx Android fixes for loading external buffer files * Scene setup * Added missing shader stages * Removed ASSIMP from build files * Fixed compiler warning * Removed ASSIMP from readmes * Android build files cleanup * Replaced ktx submodule with only the files required for this repo The ktx submodule was a tad too big and contained lots of files not required for this repo * Moved ktx build files into base project * Use glTF assets * Use glTF assets * Removed license files, will be moved to asset pack * Use RGBA textures * Use RGBA cubemp texture with face assignment based on original images Refs #679 * Android build files * Removed textures All textures will be moved to the asset pack * Ignore asset folders * Removed font Fonts will be moved to the asset pack * Link to gltf asset pack * Updated gitignore * Android build file
2020-07-28 20:20:38 +02:00
glm::vec4 lightPos = glm::vec4(0.0f, -2.5f, 0.0f, 1.0);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Replaced vkTools::UniformData with newer vk::Buffer for uniform buffers, some renaming, small fixes and corrections
2016-12-24 12:48:01 +01:00
struct UBO {
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
glm::mat4 projection;
glm::mat4 view;
glm::mat4 model;
glm::vec4 lightPos;
Replaced vkTools::UniformData with newer vk::Buffer for uniform buffers, some renaming, small fixes and corrections
2016-12-24 12:48:01 +01:00
};
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Replaced vkTools::UniformData with newer vk::Buffer for uniform buffers, some renaming, small fixes and corrections
2016-12-24 12:48:01 +01:00
UBO uboVSscene, uboOffscreenVS;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
struct {
VkPipeline scene;
VkPipeline offscreen;
Much improved cube map visualization Now displays all six cube map faces as a single cross
2019-04-15 21:30:57 +02:00
VkPipeline cubemapDisplay;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
} pipelines;
struct {
Move shaders into glsl and hlsl directories Move `data/shaders` to `data/shaders/glsl` Move `data/hlsl` to `data/shaders/hlsl` Fix up shader paths in the cpp files to point to the new glsl location. `data/shaders/hlsl/compile.py` still overwrites the glsl .spv files (for now). Issue: #723
2020-05-29 16:08:53 +01:00
VkPipelineLayout scene;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
VkPipelineLayout offscreen;
} pipelineLayouts;
struct {
VkDescriptorSet scene;
VkDescriptorSet offscreen;
} descriptorSets;
VkDescriptorSetLayout descriptorSetLayout;
Use new Vulkan texture class (Refs #260)
2017-02-09 21:55:35 +01:00
vks::Texture shadowCubeMap;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Framebuffer for offscreen rendering
struct FrameBufferAttachment {
VkImage image;
VkDeviceMemory mem;
VkImageView view;
};
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
struct OffscreenPass {
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
int32_t width, height;
VkFramebuffer frameBuffer;
FrameBufferAttachment color, depth;
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VkRenderPass renderPass;
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
VkSampler sampler;
VkDescriptorImageInfo descriptor;
} offscreenPass;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Make shadowmappingomni demo spec compliant. It's illegal to use the same renderpass for rendering to a framebuffer with different format (the offscreen one in this case). Added a prepareOffscreenRenderpass function that creates a new renderpass with the correct formats, and changed the vkCreateGraphicsPipelines and vkCreateFramebuffer calls to use this one.
2016-05-17 15:52:33 +01:00
VkFormat fbDepthFormat;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
{
Replaced text overlay with proper UI overlay
2017-11-01 14:22:10 +01:00
title = "Point light shadows (cubemap)";
settings.overlay = true;
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
camera.type = Camera::CameraType::lookat;
camera.setPerspective(45.0f, (float)width / (float)height, zNear, zFar);
camera.setRotation(glm::vec3(-20.5f, -673.0f, 0.0f));
Merge glTF branch (#747) * Added helper function for easy pipeline vertex input state create info structure setup from glTF model vertex class * Split glTF loader into header and implementation * Updated sample to use glTF * Removed collada files Replaced assets are now part of the asset pack * Return value for glTF model vertex input state create info helper * Removed unused assets * Use glTF assets * Added default material for glTF node's without materials * Use glTF assets * Apply pre-transforms to normals * Use glTF assets * Use glTF assets * Use vertex input state from glTF model class * Scene setup * Use glTF assets * Use glTF assets * Display error message and exit if glTF file could not be loaded * Use glTF assets * Use glTF assets * Use glTF assets * Remove unused buffer binds * Use glTF assets * Remove no longer used model files * Remove no longer used model files * Added support for rendering glTF models with images * glTF model normal pre-transform ignores translation * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Only add combined image samplers to pool if actually used in the scene * Use global descriptor set layouts * Use global descriptor set layouts * Use glTF assets * Use glTF assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Remove no-longer used model * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used model * Use glTF assets Code cleanup Use RGBA texture instead of different compressed formats Removed no-longer used assets * Adnrdoid build file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders * Added vertex count and way of passing additional memory property type flags to glTF loader * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders * Remove unfinished sample * Completely reworked push constants sample Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Android CMake build files * Removed un-used asset * Explicit buffer binding function * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Removed no-longer used assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used assets * Remove no-longer used asset * Use glTF assets Code cleanup and refactoring Performance optimizations Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Pass vertex size and calculate multiplier in shaders instead of hard-coding With this, changes to the glTF vertex structure won't break the ray tracing samples * Load tangents (if present) * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code * Android build * Normal mapping fixes Udpated HLSL shaders * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Code cleanup, comments * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Added sample count to framebuffer create info * Removed no-longer used assets * Android build Removed no-longer used assets * Code cleanup and heavy refactoring Updated GLSL and HLSL shaders Use tangents stored in GLSL instead of calculating them in the fragment shader * Renamed textured PBR sample main cpp file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Removed no-longer used assets * Android build files * Android build files * Use glTF assets Removed no-longer used assets * Fixed HLSL shaders * Android build files * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Added flag to disable glTF image loading Useful for samples that use their own textures or don't use textures at all to speed up loading * Use glTF assets Code cleanup Use Sponza scene instead of Sibenik to better highlight the effect Updated GLSL and HLSL shaders * Updated Android build files * Removed left-over comment * Use Sponza scene for the SSAO sample * Removed unused code * Removed ASSIMP No longer required as all samples now use the glTF file format * Added missing vertex shader stage * Removed old ASSIMP-based model loader * Added support for loading external glTF images from ktx Android fixes for loading external buffer files * Scene setup * Added missing shader stages * Removed ASSIMP from build files * Fixed compiler warning * Removed ASSIMP from readmes * Android build files cleanup * Replaced ktx submodule with only the files required for this repo The ktx submodule was a tad too big and contained lots of files not required for this repo * Moved ktx build files into base project * Use glTF assets * Use glTF assets * Removed license files, will be moved to asset pack * Use RGBA textures * Use RGBA cubemp texture with face assignment based on original images Refs #679 * Android build files * Removed textures All textures will be moved to the asset pack * Ignore asset folders * Removed font Fonts will be moved to the asset pack * Link to gltf asset pack * Updated gitignore * Android build file
2020-07-28 20:20:38 +02:00
camera.setPosition(glm::vec3(0.0f, 0.5f, -15.0f));
timerSpeed *= 0.5f;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
}
~VulkanExample()
{
Move shaders into glsl and hlsl directories Move `data/shaders` to `data/shaders/glsl` Move `data/hlsl` to `data/shaders/hlsl` Fix up shader paths in the cpp files to point to the new glsl location. `data/shaders/hlsl/compile.py` still overwrites the glsl .spv files (for now). Issue: #723
2020-05-29 16:08:53 +01:00
// Clean up used Vulkan resources
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Note : Inherited destructor cleans up resources stored in base class
// Cube map
vkDestroyImageView(device, shadowCubeMap.view, nullptr);
vkDestroyImage(device, shadowCubeMap.image, nullptr);
vkDestroySampler(device, shadowCubeMap.sampler, nullptr);
vkFreeMemory(device, shadowCubeMap.deviceMemory, nullptr);
// Frame buffer
// Color attachment
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
vkDestroyImageView(device, offscreenPass.color.view, nullptr);
vkDestroyImage(device, offscreenPass.color.image, nullptr);
vkFreeMemory(device, offscreenPass.color.mem, nullptr);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Depth attachment
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
vkDestroyImageView(device, offscreenPass.depth.view, nullptr);
vkDestroyImage(device, offscreenPass.depth.image, nullptr);
vkFreeMemory(device, offscreenPass.depth.mem, nullptr);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
vkDestroyFramebuffer(device, offscreenPass.frameBuffer, nullptr);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
vkDestroyRenderPass(device, offscreenPass.renderPass, nullptr);
Make shadowmappingomni demo spec compliant. It's illegal to use the same renderpass for rendering to a framebuffer with different format (the offscreen one in this case). Added a prepareOffscreenRenderpass function that creates a new renderpass with the correct formats, and changed the vkCreateGraphicsPipelines and vkCreateFramebuffer calls to use this one.
2016-05-17 15:52:33 +01:00
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Pipelibes
vkDestroyPipeline(device, pipelines.scene, nullptr);
vkDestroyPipeline(device, pipelines.offscreen, nullptr);
Much improved cube map visualization Now displays all six cube map faces as a single cross
2019-04-15 21:30:57 +02:00
vkDestroyPipeline(device, pipelines.cubemapDisplay, nullptr);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
vkDestroyPipelineLayout(device, pipelineLayouts.scene, nullptr);
vkDestroyPipelineLayout(device, pipelineLayouts.offscreen, nullptr);
vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr);
// Uniform buffers
Replaced vkTools::UniformData with newer vk::Buffer for uniform buffers, some renaming, small fixes and corrections
2016-12-24 12:48:01 +01:00
uniformBuffers.offscreen.destroy();
uniformBuffers.scene.destroy();
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
}
void prepareCubeMap()
{
shadowCubeMap.width = TEX_DIM;
shadowCubeMap.height = TEX_DIM;
Move shaders into glsl and hlsl directories Move `data/shaders` to `data/shaders/glsl` Move `data/hlsl` to `data/shaders/hlsl` Fix up shader paths in the cpp files to point to the new glsl location. `data/shaders/hlsl/compile.py` still overwrites the glsl .spv files (for now). Issue: #723
2020-05-29 16:08:53 +01:00
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// 32 bit float format for higher precision
VkFormat format = VK_FORMAT_R32_SFLOAT;
// Cube map image description
Moved Initializers to vks namespce (Refs #260)
2017-02-12 11:12:42 +01:00
VkImageCreateInfo imageCreateInfo = vks::initializers::imageCreateInfo();
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
imageCreateInfo.imageType = VK_IMAGE_TYPE_2D;
imageCreateInfo.format = format;
imageCreateInfo.extent = { shadowCubeMap.width, shadowCubeMap.height, 1 };
imageCreateInfo.mipLevels = 1;
imageCreateInfo.arrayLayers = 6;
imageCreateInfo.samples = VK_SAMPLE_COUNT_1_BIT;
imageCreateInfo.tiling = VK_IMAGE_TILING_OPTIMAL;
imageCreateInfo.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
imageCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
Use undefined initial image layout (fixes #187), added missing layout transition for compute texture target in ray tracing example
2016-06-22 20:30:14 +02:00
imageCreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
imageCreateInfo.flags = VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT;
Moved Initializers to vks namespce (Refs #260)
2017-02-12 11:12:42 +01:00
VkMemoryAllocateInfo memAllocInfo = vks::initializers::memoryAllocateInfo();
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
VkMemoryRequirements memReqs;
Code cleanup
2020-04-20 22:13:51 +02:00
VkCommandBuffer layoutCmd = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Create cube map image
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VK_CHECK_RESULT(vkCreateImage(device, &imageCreateInfo, nullptr, &shadowCubeMap.image));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
vkGetImageMemoryRequirements(device, shadowCubeMap.image, &memReqs);
memAllocInfo.allocationSize = memReqs.size;
Replaced example base memory type index function with function from VulkanDevice
2016-07-23 20:42:03 +02:00
memAllocInfo.memoryTypeIndex = vulkanDevice->getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VK_CHECK_RESULT(vkAllocateMemory(device, &memAllocInfo, nullptr, &shadowCubeMap.deviceMemory));
VK_CHECK_RESULT(vkBindImageMemory(device, shadowCubeMap.image, shadowCubeMap.deviceMemory, 0));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Image barrier for optimal image (target)
Fixed image layout transitions and initial layouts and command buffer submissions for offscreen examples
2016-03-13 16:04:39 +01:00
VkImageSubresourceRange subresourceRange = {};
subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
subresourceRange.baseMipLevel = 0;
subresourceRange.levelCount = 1;
subresourceRange.layerCount = 6;
Moved tool functions to vks namespace (Refs #260)
2017-02-12 13:10:05 +01:00
vks::tools::setImageLayout(
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
layoutCmd,
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
shadowCubeMap.image,
Use undefined initial image layout (fixes #187), added missing layout transition for compute texture target in ray tracing example
2016-06-22 20:30:14 +02:00
VK_IMAGE_LAYOUT_UNDEFINED,
Fixed image layout transitions and initial layouts and command buffer submissions for offscreen examples
2016-03-13 16:04:39 +01:00
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
subresourceRange);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Code cleanup
2020-04-20 22:13:51 +02:00
vulkanDevice->flushCommandBuffer(layoutCmd, queue, true);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Create sampler
Moved Initializers to vks namespce (Refs #260)
2017-02-12 11:12:42 +01:00
VkSamplerCreateInfo sampler = vks::initializers::samplerCreateInfo();
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
sampler.magFilter = TEX_FILTER;
sampler.minFilter = TEX_FILTER;
sampler.mipmapMode = VK_SAMPLER_MIPMAP_MODE_LINEAR;
sampler.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER;
sampler.addressModeV = sampler.addressModeU;
sampler.addressModeW = sampler.addressModeU;
sampler.mipLodBias = 0.0f;
Set sampler max. anisotropy to 1.0f instead of 0.0f (valdidation) Refs #277
2017-06-17 16:07:38 +02:00
sampler.maxAnisotropy = 1.0f;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
sampler.compareOp = VK_COMPARE_OP_NEVER;
sampler.minLod = 0.0f;
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
sampler.maxLod = 1.0f;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
sampler.borderColor = VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE;
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VK_CHECK_RESULT(vkCreateSampler(device, &sampler, nullptr, &shadowCubeMap.sampler));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Create image view
Moved Initializers to vks namespce (Refs #260)
2017-02-12 11:12:42 +01:00
VkImageViewCreateInfo view = vks::initializers::imageViewCreateInfo();
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
view.image = VK_NULL_HANDLE;
view.viewType = VK_IMAGE_VIEW_TYPE_CUBE;
view.format = format;
view.components = { VK_COMPONENT_SWIZZLE_R };
view.subresourceRange = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 };
view.subresourceRange.layerCount = 6;
view.image = shadowCubeMap.image;
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VK_CHECK_RESULT(vkCreateImageView(device, &view, nullptr, &shadowCubeMap.view));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
}
// Prepare a new framebuffer for offscreen rendering
// The contents of this framebuffer are then
// copied to the different cube map faces
void prepareOffscreenFramebuffer()
{
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
offscreenPass.width = FB_DIM;
offscreenPass.height = FB_DIM;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
VkFormat fbColorFormat = FB_COLOR_FORMAT;
// Color attachment
Moved Initializers to vks namespce (Refs #260)
2017-02-12 11:12:42 +01:00
VkImageCreateInfo imageCreateInfo = vks::initializers::imageCreateInfo();
Use undefined initial image layout (fixes #187), added missing layout transition for compute texture target in ray tracing example
2016-06-22 20:30:14 +02:00
imageCreateInfo.imageType = VK_IMAGE_TYPE_2D;
imageCreateInfo.format = fbColorFormat;
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
imageCreateInfo.extent.width = offscreenPass.width;
imageCreateInfo.extent.height = offscreenPass.height;
Use undefined initial image layout (fixes #187), added missing layout transition for compute texture target in ray tracing example
2016-06-22 20:30:14 +02:00
imageCreateInfo.extent.depth = 1;
imageCreateInfo.mipLevels = 1;
imageCreateInfo.arrayLayers = 1;
imageCreateInfo.samples = VK_SAMPLE_COUNT_1_BIT;
imageCreateInfo.tiling = VK_IMAGE_TILING_OPTIMAL;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Image of the framebuffer is blit source
Use undefined initial image layout (fixes #187), added missing layout transition for compute texture target in ray tracing example
2016-06-22 20:30:14 +02:00
imageCreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
imageCreateInfo.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
imageCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Moved Initializers to vks namespce (Refs #260)
2017-02-12 11:12:42 +01:00
VkMemoryAllocateInfo memAlloc = vks::initializers::memoryAllocateInfo();
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Moved Initializers to vks namespce (Refs #260)
2017-02-12 11:12:42 +01:00
VkImageViewCreateInfo colorImageView = vks::initializers::imageViewCreateInfo();
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
colorImageView.viewType = VK_IMAGE_VIEW_TYPE_2D;
colorImageView.format = fbColorFormat;
colorImageView.flags = 0;
colorImageView.subresourceRange = {};
colorImageView.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
colorImageView.subresourceRange.baseMipLevel = 0;
colorImageView.subresourceRange.levelCount = 1;
colorImageView.subresourceRange.baseArrayLayer = 0;
colorImageView.subresourceRange.layerCount = 1;
VkMemoryRequirements memReqs;
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
VK_CHECK_RESULT(vkCreateImage(device, &imageCreateInfo, nullptr, &offscreenPass.color.image));
vkGetImageMemoryRequirements(device, offscreenPass.color.image, &memReqs);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
memAlloc.allocationSize = memReqs.size;
Replaced example base memory type index function with function from VulkanDevice
2016-07-23 20:42:03 +02:00
memAlloc.memoryTypeIndex = vulkanDevice->getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
VK_CHECK_RESULT(vkAllocateMemory(device, &memAlloc, nullptr, &offscreenPass.color.mem));
VK_CHECK_RESULT(vkBindImageMemory(device, offscreenPass.color.image, offscreenPass.color.mem, 0));
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
Code cleanup
2020-04-20 22:13:51 +02:00
VkCommandBuffer layoutCmd = vulkanDevice->createCommandBuffer(VK_COMMAND_BUFFER_LEVEL_PRIMARY, true);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Moved tool functions to vks namespace (Refs #260)
2017-02-12 13:10:05 +01:00
vks::tools::setImageLayout(
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
layoutCmd,
Move shaders into glsl and hlsl directories Move `data/shaders` to `data/shaders/glsl` Move `data/hlsl` to `data/shaders/hlsl` Fix up shader paths in the cpp files to point to the new glsl location. `data/shaders/hlsl/compile.py` still overwrites the glsl .spv files (for now). Issue: #723
2020-05-29 16:08:53 +01:00
offscreenPass.color.image,
VK_IMAGE_ASPECT_COLOR_BIT,
VK_IMAGE_LAYOUT_UNDEFINED,
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
colorImageView.image = offscreenPass.color.image;
VK_CHECK_RESULT(vkCreateImageView(device, &colorImageView, nullptr, &offscreenPass.color.view));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Depth stencil attachment
Use undefined initial image layout (fixes #187), added missing layout transition for compute texture target in ray tracing example
2016-06-22 20:30:14 +02:00
imageCreateInfo.format = fbDepthFormat;
imageCreateInfo.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Moved Initializers to vks namespce (Refs #260)
2017-02-12 11:12:42 +01:00
VkImageViewCreateInfo depthStencilView = vks::initializers::imageViewCreateInfo();
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
depthStencilView.viewType = VK_IMAGE_VIEW_TYPE_2D;
depthStencilView.format = fbDepthFormat;
depthStencilView.flags = 0;
depthStencilView.subresourceRange = {};
Fixed image layout transitions and initial layouts and command buffer submissions for offscreen examples
2016-03-13 16:04:39 +01:00
depthStencilView.subresourceRange.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
depthStencilView.subresourceRange.baseMipLevel = 0;
depthStencilView.subresourceRange.levelCount = 1;
depthStencilView.subresourceRange.baseArrayLayer = 0;
depthStencilView.subresourceRange.layerCount = 1;
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
VK_CHECK_RESULT(vkCreateImage(device, &imageCreateInfo, nullptr, &offscreenPass.depth.image));
vkGetImageMemoryRequirements(device, offscreenPass.depth.image, &memReqs);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
memAlloc.allocationSize = memReqs.size;
Replaced example base memory type index function with function from VulkanDevice
2016-07-23 20:42:03 +02:00
memAlloc.memoryTypeIndex = vulkanDevice->getMemoryType(memReqs.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
VK_CHECK_RESULT(vkAllocateMemory(device, &memAlloc, nullptr, &offscreenPass.depth.mem));
VK_CHECK_RESULT(vkBindImageMemory(device, offscreenPass.depth.image, offscreenPass.depth.mem, 0));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Moved tool functions to vks namespace (Refs #260)
2017-02-12 13:10:05 +01:00
vks::tools::setImageLayout(
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
layoutCmd,
Move shaders into glsl and hlsl directories Move `data/shaders` to `data/shaders/glsl` Move `data/hlsl` to `data/shaders/hlsl` Fix up shader paths in the cpp files to point to the new glsl location. `data/shaders/hlsl/compile.py` still overwrites the glsl .spv files (for now). Issue: #723
2020-05-29 16:08:53 +01:00
offscreenPass.depth.image,
Fixed image layout transitions and initial layouts and command buffer submissions for offscreen examples
2016-03-13 16:04:39 +01:00
VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT,
Use undefined initial image layout (fixes #187), added missing layout transition for compute texture target in ray tracing example
2016-06-22 20:30:14 +02:00
VK_IMAGE_LAYOUT_UNDEFINED,
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
Code cleanup
2020-04-20 22:13:51 +02:00
vulkanDevice->flushCommandBuffer(layoutCmd, queue, true);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
depthStencilView.image = offscreenPass.depth.image;
VK_CHECK_RESULT(vkCreateImageView(device, &depthStencilView, nullptr, &offscreenPass.depth.view));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
VkImageView attachments[2];
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
attachments[0] = offscreenPass.color.view;
attachments[1] = offscreenPass.depth.view;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Moved Initializers to vks namespce (Refs #260)
2017-02-12 11:12:42 +01:00
VkFramebufferCreateInfo fbufCreateInfo = vks::initializers::framebufferCreateInfo();
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
fbufCreateInfo.renderPass = offscreenPass.renderPass;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
fbufCreateInfo.attachmentCount = 2;
fbufCreateInfo.pAttachments = attachments;
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
fbufCreateInfo.width = offscreenPass.width;
fbufCreateInfo.height = offscreenPass.height;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
fbufCreateInfo.layers = 1;
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
VK_CHECK_RESULT(vkCreateFramebuffer(device, &fbufCreateInfo, nullptr, &offscreenPass.frameBuffer));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
}
// Updates a single cube map face
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
// Renders the scene with face's view and does a copy from framebuffer to cube face
// Uses push constants for quick update of view matrix for the current cube map face
void updateCubeFace(uint32_t faceIndex, VkCommandBuffer commandBuffer)
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
{
VkClearValue clearValues[2];
clearValues[0].color = { { 0.0f, 0.0f, 0.0f, 1.0f } };
clearValues[1].depthStencil = { 1.0f, 0 };
Moved Initializers to vks namespce (Refs #260)
2017-02-12 11:12:42 +01:00
VkRenderPassBeginInfo renderPassBeginInfo = vks::initializers::renderPassBeginInfo();
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Reuse render pass from example pass
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
renderPassBeginInfo.renderPass = offscreenPass.renderPass;
renderPassBeginInfo.framebuffer = offscreenPass.frameBuffer;
renderPassBeginInfo.renderArea.extent.width = offscreenPass.width;
renderPassBeginInfo.renderArea.extent.height = offscreenPass.height;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
renderPassBeginInfo.clearValueCount = 2;
renderPassBeginInfo.pClearValues = clearValues;
// Update view matrix via push constant
glm matrix initialization
2017-09-24 18:17:07 +02:00
glm::mat4 viewMatrix = glm::mat4(1.0f);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
switch (faceIndex)
{
case 0: // POSITIVE_X
Use glm::radians instead of deg_to_rad (Fixes #37)
2016-03-08 20:59:25 +01:00
viewMatrix = glm::rotate(viewMatrix, glm::radians(90.0f), glm::vec3(0.0f, 1.0f, 0.0f));
viewMatrix = glm::rotate(viewMatrix, glm::radians(180.0f), glm::vec3(1.0f, 0.0f, 0.0f));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
break;
case 1: // NEGATIVE_X
Use glm::radians instead of deg_to_rad (Fixes #37)
2016-03-08 20:59:25 +01:00
viewMatrix = glm::rotate(viewMatrix, glm::radians(-90.0f), glm::vec3(0.0f, 1.0f, 0.0f));
viewMatrix = glm::rotate(viewMatrix, glm::radians(180.0f), glm::vec3(1.0f, 0.0f, 0.0f));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
break;
case 2: // POSITIVE_Y
Use glm::radians instead of deg_to_rad (Fixes #37)
2016-03-08 20:59:25 +01:00
viewMatrix = glm::rotate(viewMatrix, glm::radians(-90.0f), glm::vec3(1.0f, 0.0f, 0.0f));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
break;
case 3: // NEGATIVE_Y
Use glm::radians instead of deg_to_rad (Fixes #37)
2016-03-08 20:59:25 +01:00
viewMatrix = glm::rotate(viewMatrix, glm::radians(90.0f), glm::vec3(1.0f, 0.0f, 0.0f));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
break;
case 4: // POSITIVE_Z
Use glm::radians instead of deg_to_rad (Fixes #37)
2016-03-08 20:59:25 +01:00
viewMatrix = glm::rotate(viewMatrix, glm::radians(180.0f), glm::vec3(1.0f, 0.0f, 0.0f));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
break;
case 5: // NEGATIVE_Z
Use glm::radians instead of deg_to_rad (Fixes #37)
2016-03-08 20:59:25 +01:00
viewMatrix = glm::rotate(viewMatrix, glm::radians(180.0f), glm::vec3(0.0f, 0.0f, 1.0f));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
break;
}
Fixes for examples using push constants (now working fine on AMD too)
2016-03-02 19:58:06 +01:00
// Render scene from cube face's point of view
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
vkCmdBeginRenderPass(commandBuffer, &renderPassBeginInfo, VK_SUBPASS_CONTENTS_INLINE);
Fixes for examples using push constants (now working fine on AMD too)
2016-03-02 19:58:06 +01:00
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Update shader push constant block
// Contains current face view matrix
vkCmdPushConstants(
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
commandBuffer,
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
pipelineLayouts.offscreen,
VK_SHADER_STAGE_VERTEX_BIT,
0,
sizeof(glm::mat4),
&viewMatrix);
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelines.offscreen);
vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayouts.offscreen, 0, 1, &descriptorSets.offscreen, 0, NULL);
Merge glTF branch (#747) * Added helper function for easy pipeline vertex input state create info structure setup from glTF model vertex class * Split glTF loader into header and implementation * Updated sample to use glTF * Removed collada files Replaced assets are now part of the asset pack * Return value for glTF model vertex input state create info helper * Removed unused assets * Use glTF assets * Added default material for glTF node's without materials * Use glTF assets * Apply pre-transforms to normals * Use glTF assets * Use glTF assets * Use vertex input state from glTF model class * Scene setup * Use glTF assets * Use glTF assets * Display error message and exit if glTF file could not be loaded * Use glTF assets * Use glTF assets * Use glTF assets * Remove unused buffer binds * Use glTF assets * Remove no longer used model files * Remove no longer used model files * Added support for rendering glTF models with images * glTF model normal pre-transform ignores translation * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Only add combined image samplers to pool if actually used in the scene * Use global descriptor set layouts * Use global descriptor set layouts * Use glTF assets * Use glTF assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Remove no-longer used model * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used model * Use glTF assets Code cleanup Use RGBA texture instead of different compressed formats Removed no-longer used assets * Adnrdoid build file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders * Added vertex count and way of passing additional memory property type flags to glTF loader * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders * Remove unfinished sample * Completely reworked push constants sample Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Android CMake build files * Removed un-used asset * Explicit buffer binding function * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Removed no-longer used assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used assets * Remove no-longer used asset * Use glTF assets Code cleanup and refactoring Performance optimizations Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Pass vertex size and calculate multiplier in shaders instead of hard-coding With this, changes to the glTF vertex structure won't break the ray tracing samples * Load tangents (if present) * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code * Android build * Normal mapping fixes Udpated HLSL shaders * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Code cleanup, comments * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Added sample count to framebuffer create info * Removed no-longer used assets * Android build Removed no-longer used assets * Code cleanup and heavy refactoring Updated GLSL and HLSL shaders Use tangents stored in GLSL instead of calculating them in the fragment shader * Renamed textured PBR sample main cpp file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Removed no-longer used assets * Android build files * Android build files * Use glTF assets Removed no-longer used assets * Fixed HLSL shaders * Android build files * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Added flag to disable glTF image loading Useful for samples that use their own textures or don't use textures at all to speed up loading * Use glTF assets Code cleanup Use Sponza scene instead of Sibenik to better highlight the effect Updated GLSL and HLSL shaders * Updated Android build files * Removed left-over comment * Use Sponza scene for the SSAO sample * Removed unused code * Removed ASSIMP No longer required as all samples now use the glTF file format * Added missing vertex shader stage * Removed old ASSIMP-based model loader * Added support for loading external glTF images from ktx Android fixes for loading external buffer files * Scene setup * Added missing shader stages * Removed ASSIMP from build files * Fixed compiler warning * Removed ASSIMP from readmes * Android build files cleanup * Replaced ktx submodule with only the files required for this repo The ktx submodule was a tad too big and contained lots of files not required for this repo * Moved ktx build files into base project * Use glTF assets * Use glTF assets * Removed license files, will be moved to asset pack * Use RGBA textures * Use RGBA cubemp texture with face assignment based on original images Refs #679 * Android build files * Removed textures All textures will be moved to the asset pack * Ignore asset folders * Removed font Fonts will be moved to the asset pack * Link to gltf asset pack * Updated gitignore * Android build file
2020-07-28 20:20:38 +02:00
models.scene.draw(commandBuffer);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
vkCmdEndRenderPass(commandBuffer);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Make sure color writes to the framebuffer are finished before using it as transfer source
Moved tool functions to vks namespace (Refs #260)
2017-02-12 13:10:05 +01:00
vks::tools::setImageLayout(
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
commandBuffer,
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
offscreenPass.color.image,
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
VK_IMAGE_ASPECT_COLOR_BIT,
VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
Shadowmappingomni: Fix shadowCubeMap layout transitions and layout in descriptor set. Fixes #360
2017-07-20 14:20:43 +02:00
VkImageSubresourceRange cubeFaceSubresourceRange = {};
cubeFaceSubresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
cubeFaceSubresourceRange.baseMipLevel = 0;
cubeFaceSubresourceRange.levelCount = 1;
cubeFaceSubresourceRange.baseArrayLayer = faceIndex;
cubeFaceSubresourceRange.layerCount = 1;
// Change image layout of one cubemap face to transfer destination
vks::tools::setImageLayout(
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
commandBuffer,
Shadowmappingomni: Fix shadowCubeMap layout transitions and layout in descriptor set. Fixes #360
2017-07-20 14:20:43 +02:00
shadowCubeMap.image,
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
cubeFaceSubresourceRange);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Copy region for transfer from framebuffer to cube face
VkImageCopy copyRegion = {};
copyRegion.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
copyRegion.srcSubresource.baseArrayLayer = 0;
copyRegion.srcSubresource.mipLevel = 0;
copyRegion.srcSubresource.layerCount = 1;
copyRegion.srcOffset = { 0, 0, 0 };
copyRegion.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
copyRegion.dstSubresource.baseArrayLayer = faceIndex;
copyRegion.dstSubresource.mipLevel = 0;
copyRegion.dstSubresource.layerCount = 1;
copyRegion.dstOffset = { 0, 0, 0 };
copyRegion.extent.width = shadowCubeMap.width;
copyRegion.extent.height = shadowCubeMap.height;
copyRegion.extent.depth = 1;
// Put image copy into command buffer
vkCmdCopyImage(
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
commandBuffer,
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
offscreenPass.color.image,
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
shadowCubeMap.image,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
1,
&copyRegion);
Move shaders into glsl and hlsl directories Move `data/shaders` to `data/shaders/glsl` Move `data/hlsl` to `data/shaders/hlsl` Fix up shader paths in the cpp files to point to the new glsl location. `data/shaders/hlsl/compile.py` still overwrites the glsl .spv files (for now). Issue: #723
2020-05-29 16:08:53 +01:00
// Transform framebuffer color attachment back
Moved tool functions to vks namespace (Refs #260)
2017-02-12 13:10:05 +01:00
vks::tools::setImageLayout(
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
commandBuffer,
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
offscreenPass.color.image,
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
VK_IMAGE_ASPECT_COLOR_BIT,
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
Shadowmappingomni: Fix shadowCubeMap layout transitions and layout in descriptor set. Fixes #360
2017-07-20 14:20:43 +02:00
// Change image layout of copied face to shader read
vks::tools::setImageLayout(
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
commandBuffer,
Shadowmappingomni: Fix shadowCubeMap layout transitions and layout in descriptor set. Fixes #360
2017-07-20 14:20:43 +02:00
shadowCubeMap.image,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
cubeFaceSubresourceRange);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
}
void buildCommandBuffers()
{
Moved Initializers to vks namespce (Refs #260)
2017-02-12 11:12:42 +01:00
VkCommandBufferBeginInfo cmdBufInfo = vks::initializers::commandBufferBeginInfo();
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
for (int32_t i = 0; i < drawCmdBuffers.size(); ++i)
{
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VK_CHECK_RESULT(vkBeginCommandBuffer(drawCmdBuffers[i], &cmdBufInfo));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
/*
Generate shadow cube maps using one render pass per face
*/
{
VkViewport viewport = vks::initializers::viewport((float)offscreenPass.width, (float)offscreenPass.height, 0.0f, 1.0f);
vkCmdSetViewport(drawCmdBuffers[i], 0, 1, &viewport);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
VkRect2D scissor = vks::initializers::rect2D(offscreenPass.width, offscreenPass.height, 0, 0);
vkCmdSetScissor(drawCmdBuffers[i], 0, 1, &scissor);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
for (uint32_t face = 0; face < 6; face++) {
updateCubeFace(face, drawCmdBuffers[i]);
}
}
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
/*
Note: Explicit synchronization is not required between the render pass, as this is done implicit via sub pass dependencies
*/
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
/*
Scene rendering with applied shadow map
*/
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
{
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
VkClearValue clearValues[2];
clearValues[0].color = defaultClearColor;
clearValues[1].depthStencil = { 1.0f, 0 };
VkRenderPassBeginInfo renderPassBeginInfo = vks::initializers::renderPassBeginInfo();
renderPassBeginInfo.renderPass = renderPass;
renderPassBeginInfo.framebuffer = frameBuffers[i];
renderPassBeginInfo.renderArea.extent.width = width;
renderPassBeginInfo.renderArea.extent.height = height;
renderPassBeginInfo.clearValueCount = 2;
renderPassBeginInfo.pClearValues = clearValues;
vkCmdBeginRenderPass(drawCmdBuffers[i], &renderPassBeginInfo, VK_SUBPASS_CONTENTS_INLINE);
VkViewport viewport = vks::initializers::viewport((float)width, (float)height, 0.0f, 1.0f);
vkCmdSetViewport(drawCmdBuffers[i], 0, 1, &viewport);
VkRect2D scissor = vks::initializers::rect2D(width, height, 0, 0);
vkCmdSetScissor(drawCmdBuffers[i], 0, 1, &scissor);
VkDeviceSize offsets[1] = { 0 };
vkCmdBindDescriptorSets(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayouts.scene, 0, 1, &descriptorSets.scene, 0, NULL);
if (displayCubeMap)
{
Much improved cube map visualization Now displays all six cube map faces as a single cross
2019-04-15 21:30:57 +02:00
// Display all six sides of the shadow cube map
// Note: Visualization of the different faces is done in the fragment shader, see cubemapdisplay.frag
vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelines.cubemapDisplay);
Merge glTF branch (#747) * Added helper function for easy pipeline vertex input state create info structure setup from glTF model vertex class * Split glTF loader into header and implementation * Updated sample to use glTF * Removed collada files Replaced assets are now part of the asset pack * Return value for glTF model vertex input state create info helper * Removed unused assets * Use glTF assets * Added default material for glTF node's without materials * Use glTF assets * Apply pre-transforms to normals * Use glTF assets * Use glTF assets * Use vertex input state from glTF model class * Scene setup * Use glTF assets * Use glTF assets * Display error message and exit if glTF file could not be loaded * Use glTF assets * Use glTF assets * Use glTF assets * Remove unused buffer binds * Use glTF assets * Remove no longer used model files * Remove no longer used model files * Added support for rendering glTF models with images * glTF model normal pre-transform ignores translation * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Only add combined image samplers to pool if actually used in the scene * Use global descriptor set layouts * Use global descriptor set layouts * Use glTF assets * Use glTF assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Remove no-longer used model * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used model * Use glTF assets Code cleanup Use RGBA texture instead of different compressed formats Removed no-longer used assets * Adnrdoid build file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders * Added vertex count and way of passing additional memory property type flags to glTF loader * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders * Remove unfinished sample * Completely reworked push constants sample Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Android CMake build files * Removed un-used asset * Explicit buffer binding function * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Removed no-longer used assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used assets * Remove no-longer used asset * Use glTF assets Code cleanup and refactoring Performance optimizations Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Pass vertex size and calculate multiplier in shaders instead of hard-coding With this, changes to the glTF vertex structure won't break the ray tracing samples * Load tangents (if present) * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code * Android build * Normal mapping fixes Udpated HLSL shaders * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Code cleanup, comments * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Added sample count to framebuffer create info * Removed no-longer used assets * Android build Removed no-longer used assets * Code cleanup and heavy refactoring Updated GLSL and HLSL shaders Use tangents stored in GLSL instead of calculating them in the fragment shader * Renamed textured PBR sample main cpp file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Removed no-longer used assets * Android build files * Android build files * Use glTF assets Removed no-longer used assets * Fixed HLSL shaders * Android build files * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Added flag to disable glTF image loading Useful for samples that use their own textures or don't use textures at all to speed up loading * Use glTF assets Code cleanup Use Sponza scene instead of Sibenik to better highlight the effect Updated GLSL and HLSL shaders * Updated Android build files * Removed left-over comment * Use Sponza scene for the SSAO sample * Removed unused code * Removed ASSIMP No longer required as all samples now use the glTF file format * Added missing vertex shader stage * Removed old ASSIMP-based model loader * Added support for loading external glTF images from ktx Android fixes for loading external buffer files * Scene setup * Added missing shader stages * Removed ASSIMP from build files * Fixed compiler warning * Removed ASSIMP from readmes * Android build files cleanup * Replaced ktx submodule with only the files required for this repo The ktx submodule was a tad too big and contained lots of files not required for this repo * Moved ktx build files into base project * Use glTF assets * Use glTF assets * Removed license files, will be moved to asset pack * Use RGBA textures * Use RGBA cubemp texture with face assignment based on original images Refs #679 * Android build files * Removed textures All textures will be moved to the asset pack * Ignore asset folders * Removed font Fonts will be moved to the asset pack * Link to gltf asset pack * Updated gitignore * Android build file
2020-07-28 20:20:38 +02:00
models.debugcube.draw(drawCmdBuffers[i]);
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
}
else
{
vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelines.scene);
Merge glTF branch (#747) * Added helper function for easy pipeline vertex input state create info structure setup from glTF model vertex class * Split glTF loader into header and implementation * Updated sample to use glTF * Removed collada files Replaced assets are now part of the asset pack * Return value for glTF model vertex input state create info helper * Removed unused assets * Use glTF assets * Added default material for glTF node's without materials * Use glTF assets * Apply pre-transforms to normals * Use glTF assets * Use glTF assets * Use vertex input state from glTF model class * Scene setup * Use glTF assets * Use glTF assets * Display error message and exit if glTF file could not be loaded * Use glTF assets * Use glTF assets * Use glTF assets * Remove unused buffer binds * Use glTF assets * Remove no longer used model files * Remove no longer used model files * Added support for rendering glTF models with images * glTF model normal pre-transform ignores translation * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Only add combined image samplers to pool if actually used in the scene * Use global descriptor set layouts * Use global descriptor set layouts * Use glTF assets * Use glTF assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Remove no-longer used model * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used model * Use glTF assets Code cleanup Use RGBA texture instead of different compressed formats Removed no-longer used assets * Adnrdoid build file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders * Added vertex count and way of passing additional memory property type flags to glTF loader * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders * Remove unfinished sample * Completely reworked push constants sample Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Android CMake build files * Removed un-used asset * Explicit buffer binding function * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Removed no-longer used assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used assets * Remove no-longer used asset * Use glTF assets Code cleanup and refactoring Performance optimizations Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Pass vertex size and calculate multiplier in shaders instead of hard-coding With this, changes to the glTF vertex structure won't break the ray tracing samples * Load tangents (if present) * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code * Android build * Normal mapping fixes Udpated HLSL shaders * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Code cleanup, comments * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Added sample count to framebuffer create info * Removed no-longer used assets * Android build Removed no-longer used assets * Code cleanup and heavy refactoring Updated GLSL and HLSL shaders Use tangents stored in GLSL instead of calculating them in the fragment shader * Renamed textured PBR sample main cpp file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Removed no-longer used assets * Android build files * Android build files * Use glTF assets Removed no-longer used assets * Fixed HLSL shaders * Android build files * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Added flag to disable glTF image loading Useful for samples that use their own textures or don't use textures at all to speed up loading * Use glTF assets Code cleanup Use Sponza scene instead of Sibenik to better highlight the effect Updated GLSL and HLSL shaders * Updated Android build files * Removed left-over comment * Use Sponza scene for the SSAO sample * Removed unused code * Removed ASSIMP No longer required as all samples now use the glTF file format * Added missing vertex shader stage * Removed old ASSIMP-based model loader * Added support for loading external glTF images from ktx Android fixes for loading external buffer files * Scene setup * Added missing shader stages * Removed ASSIMP from build files * Fixed compiler warning * Removed ASSIMP from readmes * Android build files cleanup * Replaced ktx submodule with only the files required for this repo The ktx submodule was a tad too big and contained lots of files not required for this repo * Moved ktx build files into base project * Use glTF assets * Use glTF assets * Removed license files, will be moved to asset pack * Use RGBA textures * Use RGBA cubemp texture with face assignment based on original images Refs #679 * Android build files * Removed textures All textures will be moved to the asset pack * Ignore asset folders * Removed font Fonts will be moved to the asset pack * Link to gltf asset pack * Updated gitignore * Android build file
2020-07-28 20:20:38 +02:00
models.scene.draw(drawCmdBuffers[i]);
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
}
drawUI(drawCmdBuffers[i]);
vkCmdEndRenderPass(drawCmdBuffers[i]);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
}
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VK_CHECK_RESULT(vkEndCommandBuffer(drawCmdBuffers[i]));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
}
Move shaders into glsl and hlsl directories Move `data/shaders` to `data/shaders/glsl` Move `data/hlsl` to `data/shaders/hlsl` Fix up shader paths in the cpp files to point to the new glsl location. `data/shaders/hlsl/compile.py` still overwrites the glsl .spv files (for now). Issue: #723
2020-05-29 16:08:53 +01:00
}
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
void loadAssets()
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
{
Merge glTF branch (#747) * Added helper function for easy pipeline vertex input state create info structure setup from glTF model vertex class * Split glTF loader into header and implementation * Updated sample to use glTF * Removed collada files Replaced assets are now part of the asset pack * Return value for glTF model vertex input state create info helper * Removed unused assets * Use glTF assets * Added default material for glTF node's without materials * Use glTF assets * Apply pre-transforms to normals * Use glTF assets * Use glTF assets * Use vertex input state from glTF model class * Scene setup * Use glTF assets * Use glTF assets * Display error message and exit if glTF file could not be loaded * Use glTF assets * Use glTF assets * Use glTF assets * Remove unused buffer binds * Use glTF assets * Remove no longer used model files * Remove no longer used model files * Added support for rendering glTF models with images * glTF model normal pre-transform ignores translation * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Only add combined image samplers to pool if actually used in the scene * Use global descriptor set layouts * Use global descriptor set layouts * Use glTF assets * Use glTF assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Remove no-longer used model * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used model * Use glTF assets Code cleanup Use RGBA texture instead of different compressed formats Removed no-longer used assets * Adnrdoid build file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders * Added vertex count and way of passing additional memory property type flags to glTF loader * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders * Remove unfinished sample * Completely reworked push constants sample Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Android CMake build files * Removed un-used asset * Explicit buffer binding function * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Removed no-longer used assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used assets * Remove no-longer used asset * Use glTF assets Code cleanup and refactoring Performance optimizations Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Pass vertex size and calculate multiplier in shaders instead of hard-coding With this, changes to the glTF vertex structure won't break the ray tracing samples * Load tangents (if present) * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code * Android build * Normal mapping fixes Udpated HLSL shaders * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Code cleanup, comments * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Added sample count to framebuffer create info * Removed no-longer used assets * Android build Removed no-longer used assets * Code cleanup and heavy refactoring Updated GLSL and HLSL shaders Use tangents stored in GLSL instead of calculating them in the fragment shader * Renamed textured PBR sample main cpp file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Removed no-longer used assets * Android build files * Android build files * Use glTF assets Removed no-longer used assets * Fixed HLSL shaders * Android build files * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Added flag to disable glTF image loading Useful for samples that use their own textures or don't use textures at all to speed up loading * Use glTF assets Code cleanup Use Sponza scene instead of Sibenik to better highlight the effect Updated GLSL and HLSL shaders * Updated Android build files * Removed left-over comment * Use Sponza scene for the SSAO sample * Removed unused code * Removed ASSIMP No longer required as all samples now use the glTF file format * Added missing vertex shader stage * Removed old ASSIMP-based model loader * Added support for loading external glTF images from ktx Android fixes for loading external buffer files * Scene setup * Added missing shader stages * Removed ASSIMP from build files * Fixed compiler warning * Removed ASSIMP from readmes * Android build files cleanup * Replaced ktx submodule with only the files required for this repo The ktx submodule was a tad too big and contained lots of files not required for this repo * Moved ktx build files into base project * Use glTF assets * Use glTF assets * Removed license files, will be moved to asset pack * Use RGBA textures * Use RGBA cubemp texture with face assignment based on original images Refs #679 * Android build files * Removed textures All textures will be moved to the asset pack * Ignore asset folders * Removed font Fonts will be moved to the asset pack * Link to gltf asset pack * Updated gitignore * Android build file
2020-07-28 20:20:38 +02:00
const uint32_t glTFLoadingFlags = vkglTF::FileLoadingFlags::PreTransformVertices | vkglTF::FileLoadingFlags::PreMultiplyVertexColors | vkglTF::FileLoadingFlags::FlipY;
models.debugcube.loadFromFile(getAssetPath() + "models/cube.gltf", vulkanDevice, queue, glTFLoadingFlags);
models.scene.loadFromFile(getAssetPath() + "models/shadowscene_fire.gltf", vulkanDevice, queue, glTFLoadingFlags);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
}
void setupDescriptorPool()
{
// Example uses three ubos and two image samplers
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
std::vector<VkDescriptorPoolSize> poolSizes = {
Moved Initializers to vks namespce (Refs #260)
2017-02-12 11:12:42 +01:00
vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 3),
vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 2)
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
};
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
VkDescriptorPoolCreateInfo descriptorPoolInfo = vks::initializers::descriptorPoolCreateInfo(poolSizes.size(), poolSizes.data(), 3);
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VK_CHECK_RESULT(vkCreateDescriptorPool(device, &descriptorPoolInfo, nullptr, &descriptorPool));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
}
void setupDescriptorSetLayout()
{
// Shared pipeline layout
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
std::vector<VkDescriptorSetLayoutBinding> setLayoutBindings = {
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Binding 0 : Vertex shader uniform buffer
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
vks::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_SHADER_STAGE_VERTEX_BIT, 0),
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Binding 1 : Fragment shader image sampler (cube map)
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
vks::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT, 1)
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
};
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
VkDescriptorSetLayoutCreateInfo descriptorLayout = vks::initializers::descriptorSetLayoutCreateInfo(setLayoutBindings.data(), setLayoutBindings.size());
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VK_CHECK_RESULT(vkCreateDescriptorSetLayout(device, &descriptorLayout, nullptr, &descriptorSetLayout));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// 3D scene pipeline layout
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
VkPipelineLayoutCreateInfo pPipelineLayoutCreateInfo = vks::initializers::pipelineLayoutCreateInfo(&descriptorSetLayout, 1);
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VK_CHECK_RESULT(vkCreatePipelineLayout(device, &pPipelineLayoutCreateInfo, nullptr, &pipelineLayouts.scene));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Offscreen pipeline layout
// Push constants for cube map face view matrices
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
VkPushConstantRange pushConstantRange = vks::initializers::pushConstantRange(VK_SHADER_STAGE_VERTEX_BIT, sizeof(glm::mat4), 0);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Push constant ranges are part of the pipeline layout
pPipelineLayoutCreateInfo.pushConstantRangeCount = 1;
pPipelineLayoutCreateInfo.pPushConstantRanges = &pushConstantRange;
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VK_CHECK_RESULT(vkCreatePipelineLayout(device, &pPipelineLayoutCreateInfo, nullptr, &pipelineLayouts.offscreen));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
}
void setupDescriptorSets()
{
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
VkDescriptorSetAllocateInfo allocInfo = vks::initializers::descriptorSetAllocateInfo(descriptorPool, &descriptorSetLayout, 1);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// 3D scene
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VK_CHECK_RESULT(vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets.scene));
Move shaders into glsl and hlsl directories Move `data/shaders` to `data/shaders/glsl` Move `data/hlsl` to `data/shaders/hlsl` Fix up shader paths in the cpp files to point to the new glsl location. `data/shaders/hlsl/compile.py` still overwrites the glsl .spv files (for now). Issue: #723
2020-05-29 16:08:53 +01:00
// Image descriptor for the cube map
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
VkDescriptorImageInfo texDescriptor =
Moved Initializers to vks namespce (Refs #260)
2017-02-12 11:12:42 +01:00
vks::initializers::descriptorImageInfo(
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
shadowCubeMap.sampler,
shadowCubeMap.view,
Shadowmappingomni: Fix shadowCubeMap layout transitions and layout in descriptor set. Fixes #360
2017-07-20 14:20:43 +02:00
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
std::vector<VkWriteDescriptorSet> sceneDescriptorSets = {
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Binding 0 : Vertex shader uniform buffer
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
vks::initializers::writeDescriptorSet(descriptorSets.scene, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0, &uniformBuffers.scene.descriptor),
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Binding 1 : Fragment shader shadow sampler
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
vks::initializers::writeDescriptorSet(descriptorSets.scene, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, &texDescriptor)
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
};
vkUpdateDescriptorSets(device, sceneDescriptorSets.size(), sceneDescriptorSets.data(), 0, NULL);
// Offscreen
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VK_CHECK_RESULT(vkAllocateDescriptorSets(device, &allocInfo, &descriptorSets.offscreen));
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
std::vector<VkWriteDescriptorSet> offScreenWriteDescriptorSets = {
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Binding 0 : Vertex shader uniform buffer
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
vks::initializers::writeDescriptorSet(descriptorSets.offscreen, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0, &uniformBuffers.offscreen.descriptor),
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
};
vkUpdateDescriptorSets(device, offScreenWriteDescriptorSets.size(), offScreenWriteDescriptorSets.data(), 0, NULL);
}
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
// Set up a separate render pass for the offscreen frame buffer
// This is necessary as the offscreen frame buffer attachments
// use formats different to the ones from the visible frame buffer
// and at least the depth one may not be compatible
Make shadowmappingomni demo spec compliant. It's illegal to use the same renderpass for rendering to a framebuffer with different format (the offscreen one in this case). Added a prepareOffscreenRenderpass function that creates a new renderpass with the correct formats, and changed the vkCreateGraphicsPipelines and vkCreateFramebuffer calls to use this one.
2016-05-17 15:52:33 +01:00
void prepareOffscreenRenderpass()
{
VkAttachmentDescription osAttachments[2] = {};
// Find a suitable depth format
Moved tool functions to vks namespace (Refs #260)
2017-02-12 13:10:05 +01:00
VkBool32 validDepthFormat = vks::tools::getSupportedDepthFormat(physicalDevice, &fbDepthFormat);
Make shadowmappingomni demo spec compliant. It's illegal to use the same renderpass for rendering to a framebuffer with different format (the offscreen one in this case). Added a prepareOffscreenRenderpass function that creates a new renderpass with the correct formats, and changed the vkCreateGraphicsPipelines and vkCreateFramebuffer calls to use this one.
2016-05-17 15:52:33 +01:00
assert(validDepthFormat);
osAttachments[0].format = FB_COLOR_FORMAT;
osAttachments[0].samples = VK_SAMPLE_COUNT_1_BIT;
osAttachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
osAttachments[0].storeOp = VK_ATTACHMENT_STORE_OP_STORE;
osAttachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
osAttachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
osAttachments[0].initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
osAttachments[0].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
// Depth attachment
osAttachments[1].format = fbDepthFormat;
osAttachments[1].samples = VK_SAMPLE_COUNT_1_BIT;
osAttachments[1].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
osAttachments[1].storeOp = VK_ATTACHMENT_STORE_OP_STORE;
osAttachments[1].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
osAttachments[1].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
osAttachments[1].initialLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
osAttachments[1].finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
VkAttachmentReference colorReference = {};
colorReference.attachment = 0;
colorReference.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
VkAttachmentReference depthReference = {};
depthReference.attachment = 1;
depthReference.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VkSubpassDescription subpass = {};
subpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
subpass.colorAttachmentCount = 1;
subpass.pColorAttachments = &colorReference;
subpass.pDepthStencilAttachment = &depthReference;
Moved Initializers to vks namespce (Refs #260)
2017-02-12 11:12:42 +01:00
VkRenderPassCreateInfo renderPassCreateInfo = vks::initializers::renderPassCreateInfo();
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
renderPassCreateInfo.attachmentCount = 2;
renderPassCreateInfo.pAttachments = osAttachments;
renderPassCreateInfo.subpassCount = 1;
renderPassCreateInfo.pSubpasses = &subpass;
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
VK_CHECK_RESULT(vkCreateRenderPass(device, &renderPassCreateInfo, nullptr, &offscreenPass.renderPass));
Make shadowmappingomni demo spec compliant. It's illegal to use the same renderpass for rendering to a framebuffer with different format (the offscreen one in this case). Added a prepareOffscreenRenderpass function that creates a new renderpass with the correct formats, and changed the vkCreateGraphicsPipelines and vkCreateFramebuffer calls to use this one.
2016-05-17 15:52:33 +01:00
}
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
void preparePipelines()
{
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
VkPipelineInputAssemblyStateCreateInfo inputAssemblyState = vks::initializers::pipelineInputAssemblyStateCreateInfo(VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, 0, VK_FALSE);
Merge glTF branch (#747) * Added helper function for easy pipeline vertex input state create info structure setup from glTF model vertex class * Split glTF loader into header and implementation * Updated sample to use glTF * Removed collada files Replaced assets are now part of the asset pack * Return value for glTF model vertex input state create info helper * Removed unused assets * Use glTF assets * Added default material for glTF node's without materials * Use glTF assets * Apply pre-transforms to normals * Use glTF assets * Use glTF assets * Use vertex input state from glTF model class * Scene setup * Use glTF assets * Use glTF assets * Display error message and exit if glTF file could not be loaded * Use glTF assets * Use glTF assets * Use glTF assets * Remove unused buffer binds * Use glTF assets * Remove no longer used model files * Remove no longer used model files * Added support for rendering glTF models with images * glTF model normal pre-transform ignores translation * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Only add combined image samplers to pool if actually used in the scene * Use global descriptor set layouts * Use global descriptor set layouts * Use glTF assets * Use glTF assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Remove no-longer used model * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used model * Use glTF assets Code cleanup Use RGBA texture instead of different compressed formats Removed no-longer used assets * Adnrdoid build file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders * Added vertex count and way of passing additional memory property type flags to glTF loader * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders * Remove unfinished sample * Completely reworked push constants sample Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Android CMake build files * Removed un-used asset * Explicit buffer binding function * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Removed no-longer used assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used assets * Remove no-longer used asset * Use glTF assets Code cleanup and refactoring Performance optimizations Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Pass vertex size and calculate multiplier in shaders instead of hard-coding With this, changes to the glTF vertex structure won't break the ray tracing samples * Load tangents (if present) * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code * Android build * Normal mapping fixes Udpated HLSL shaders * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Code cleanup, comments * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Added sample count to framebuffer create info * Removed no-longer used assets * Android build Removed no-longer used assets * Code cleanup and heavy refactoring Updated GLSL and HLSL shaders Use tangents stored in GLSL instead of calculating them in the fragment shader * Renamed textured PBR sample main cpp file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Removed no-longer used assets * Android build files * Android build files * Use glTF assets Removed no-longer used assets * Fixed HLSL shaders * Android build files * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Added flag to disable glTF image loading Useful for samples that use their own textures or don't use textures at all to speed up loading * Use glTF assets Code cleanup Use Sponza scene instead of Sibenik to better highlight the effect Updated GLSL and HLSL shaders * Updated Android build files * Removed left-over comment * Use Sponza scene for the SSAO sample * Removed unused code * Removed ASSIMP No longer required as all samples now use the glTF file format * Added missing vertex shader stage * Removed old ASSIMP-based model loader * Added support for loading external glTF images from ktx Android fixes for loading external buffer files * Scene setup * Added missing shader stages * Removed ASSIMP from build files * Fixed compiler warning * Removed ASSIMP from readmes * Android build files cleanup * Replaced ktx submodule with only the files required for this repo The ktx submodule was a tad too big and contained lots of files not required for this repo * Moved ktx build files into base project * Use glTF assets * Use glTF assets * Removed license files, will be moved to asset pack * Use RGBA textures * Use RGBA cubemp texture with face assignment based on original images Refs #679 * Android build files * Removed textures All textures will be moved to the asset pack * Ignore asset folders * Removed font Fonts will be moved to the asset pack * Link to gltf asset pack * Updated gitignore * Android build file
2020-07-28 20:20:38 +02:00
VkPipelineRasterizationStateCreateInfo rasterizationState = vks::initializers::pipelineRasterizationStateCreateInfo(VK_POLYGON_MODE_FILL, VK_CULL_MODE_BACK_BIT, VK_FRONT_FACE_COUNTER_CLOCKWISE, 0);
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
VkPipelineColorBlendAttachmentState blendAttachmentState = vks::initializers::pipelineColorBlendAttachmentState(0xf, VK_FALSE);
VkPipelineColorBlendStateCreateInfo colorBlendState = vks::initializers::pipelineColorBlendStateCreateInfo(1, &blendAttachmentState);
VkPipelineDepthStencilStateCreateInfo depthStencilState = vks::initializers::pipelineDepthStencilStateCreateInfo(VK_TRUE, VK_TRUE, VK_COMPARE_OP_LESS_OR_EQUAL);
VkPipelineViewportStateCreateInfo viewportState = vks::initializers::pipelineViewportStateCreateInfo(1, 1, 0);
VkPipelineMultisampleStateCreateInfo multisampleState = vks::initializers::pipelineMultisampleStateCreateInfo(VK_SAMPLE_COUNT_1_BIT, 0);
std::vector<VkDynamicState> dynamicStateEnables = { VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR };
VkPipelineDynamicStateCreateInfo dynamicState = vks::initializers::pipelineDynamicStateCreateInfo(dynamicStateEnables.data(), dynamicStateEnables.size(), 0);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// 3D scene pipeline
// Load shaders
std::array<VkPipelineShaderStageCreateInfo, 2> shaderStages;
Merge glTF branch (#747) * Added helper function for easy pipeline vertex input state create info structure setup from glTF model vertex class * Split glTF loader into header and implementation * Updated sample to use glTF * Removed collada files Replaced assets are now part of the asset pack * Return value for glTF model vertex input state create info helper * Removed unused assets * Use glTF assets * Added default material for glTF node's without materials * Use glTF assets * Apply pre-transforms to normals * Use glTF assets * Use glTF assets * Use vertex input state from glTF model class * Scene setup * Use glTF assets * Use glTF assets * Display error message and exit if glTF file could not be loaded * Use glTF assets * Use glTF assets * Use glTF assets * Remove unused buffer binds * Use glTF assets * Remove no longer used model files * Remove no longer used model files * Added support for rendering glTF models with images * glTF model normal pre-transform ignores translation * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Only add combined image samplers to pool if actually used in the scene * Use global descriptor set layouts * Use global descriptor set layouts * Use glTF assets * Use glTF assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Remove no-longer used model * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used model * Use glTF assets Code cleanup Use RGBA texture instead of different compressed formats Removed no-longer used assets * Adnrdoid build file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders * Added vertex count and way of passing additional memory property type flags to glTF loader * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders * Remove unfinished sample * Completely reworked push constants sample Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Android CMake build files * Removed un-used asset * Explicit buffer binding function * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Removed no-longer used assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used assets * Remove no-longer used asset * Use glTF assets Code cleanup and refactoring Performance optimizations Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Pass vertex size and calculate multiplier in shaders instead of hard-coding With this, changes to the glTF vertex structure won't break the ray tracing samples * Load tangents (if present) * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code * Android build * Normal mapping fixes Udpated HLSL shaders * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Code cleanup, comments * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Added sample count to framebuffer create info * Removed no-longer used assets * Android build Removed no-longer used assets * Code cleanup and heavy refactoring Updated GLSL and HLSL shaders Use tangents stored in GLSL instead of calculating them in the fragment shader * Renamed textured PBR sample main cpp file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Removed no-longer used assets * Android build files * Android build files * Use glTF assets Removed no-longer used assets * Fixed HLSL shaders * Android build files * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Added flag to disable glTF image loading Useful for samples that use their own textures or don't use textures at all to speed up loading * Use glTF assets Code cleanup Use Sponza scene instead of Sibenik to better highlight the effect Updated GLSL and HLSL shaders * Updated Android build files * Removed left-over comment * Use Sponza scene for the SSAO sample * Removed unused code * Removed ASSIMP No longer required as all samples now use the glTF file format * Added missing vertex shader stage * Removed old ASSIMP-based model loader * Added support for loading external glTF images from ktx Android fixes for loading external buffer files * Scene setup * Added missing shader stages * Removed ASSIMP from build files * Fixed compiler warning * Removed ASSIMP from readmes * Android build files cleanup * Replaced ktx submodule with only the files required for this repo The ktx submodule was a tad too big and contained lots of files not required for this repo * Moved ktx build files into base project * Use glTF assets * Use glTF assets * Removed license files, will be moved to asset pack * Use RGBA textures * Use RGBA cubemp texture with face assignment based on original images Refs #679 * Android build files * Removed textures All textures will be moved to the asset pack * Ignore asset folders * Removed font Fonts will be moved to the asset pack * Link to gltf asset pack * Updated gitignore * Android build file
2020-07-28 20:20:38 +02:00
shaderStages[0] = loadShader(getShadersPath() + "shadowmappingomni/scene.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
shaderStages[1] = loadShader(getShadersPath() + "shadowmappingomni/scene.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
VkGraphicsPipelineCreateInfo pipelineCI = vks::initializers::pipelineCreateInfo(pipelineLayouts.scene, renderPass, 0);
pipelineCI.pInputAssemblyState = &inputAssemblyState;
pipelineCI.pRasterizationState = &rasterizationState;
pipelineCI.pColorBlendState = &colorBlendState;
pipelineCI.pMultisampleState = &multisampleState;
pipelineCI.pViewportState = &viewportState;
pipelineCI.pDepthStencilState = &depthStencilState;
pipelineCI.pDynamicState = &dynamicState;
pipelineCI.stageCount = shaderStages.size();
pipelineCI.pStages = shaderStages.data();
pipelineCI.pVertexInputState = vkglTF::Vertex::getPipelineVertexInputState({vkglTF::VertexComponent::Position, vkglTF::VertexComponent::Color, vkglTF::VertexComponent::Normal});
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCI, nullptr, &pipelines.scene));
// Offscreen pipeline
shaderStages[0] = loadShader(getShadersPath() + "shadowmappingomni/offscreen.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
shaderStages[1] = loadShader(getShadersPath() + "shadowmappingomni/offscreen.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
pipelineCI.layout = pipelineLayouts.offscreen;
pipelineCI.renderPass = offscreenPass.renderPass;
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCI, nullptr, &pipelines.offscreen));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
// Cube map display pipeline
Merge glTF branch (#747) * Added helper function for easy pipeline vertex input state create info structure setup from glTF model vertex class * Split glTF loader into header and implementation * Updated sample to use glTF * Removed collada files Replaced assets are now part of the asset pack * Return value for glTF model vertex input state create info helper * Removed unused assets * Use glTF assets * Added default material for glTF node's without materials * Use glTF assets * Apply pre-transforms to normals * Use glTF assets * Use glTF assets * Use vertex input state from glTF model class * Scene setup * Use glTF assets * Use glTF assets * Display error message and exit if glTF file could not be loaded * Use glTF assets * Use glTF assets * Use glTF assets * Remove unused buffer binds * Use glTF assets * Remove no longer used model files * Remove no longer used model files * Added support for rendering glTF models with images * glTF model normal pre-transform ignores translation * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Only add combined image samplers to pool if actually used in the scene * Use global descriptor set layouts * Use global descriptor set layouts * Use glTF assets * Use glTF assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Remove no-longer used model * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used model * Use glTF assets Code cleanup Use RGBA texture instead of different compressed formats Removed no-longer used assets * Adnrdoid build file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders * Added vertex count and way of passing additional memory property type flags to glTF loader * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders * Remove unfinished sample * Completely reworked push constants sample Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Android CMake build files * Removed un-used asset * Explicit buffer binding function * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Removed no-longer used assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used assets * Remove no-longer used asset * Use glTF assets Code cleanup and refactoring Performance optimizations Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Pass vertex size and calculate multiplier in shaders instead of hard-coding With this, changes to the glTF vertex structure won't break the ray tracing samples * Load tangents (if present) * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code * Android build * Normal mapping fixes Udpated HLSL shaders * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Code cleanup, comments * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Added sample count to framebuffer create info * Removed no-longer used assets * Android build Removed no-longer used assets * Code cleanup and heavy refactoring Updated GLSL and HLSL shaders Use tangents stored in GLSL instead of calculating them in the fragment shader * Renamed textured PBR sample main cpp file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Removed no-longer used assets * Android build files * Android build files * Use glTF assets Removed no-longer used assets * Fixed HLSL shaders * Android build files * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Added flag to disable glTF image loading Useful for samples that use their own textures or don't use textures at all to speed up loading * Use glTF assets Code cleanup Use Sponza scene instead of Sibenik to better highlight the effect Updated GLSL and HLSL shaders * Updated Android build files * Removed left-over comment * Use Sponza scene for the SSAO sample * Removed unused code * Removed ASSIMP No longer required as all samples now use the glTF file format * Added missing vertex shader stage * Removed old ASSIMP-based model loader * Added support for loading external glTF images from ktx Android fixes for loading external buffer files * Scene setup * Added missing shader stages * Removed ASSIMP from build files * Fixed compiler warning * Removed ASSIMP from readmes * Android build files cleanup * Replaced ktx submodule with only the files required for this repo The ktx submodule was a tad too big and contained lots of files not required for this repo * Moved ktx build files into base project * Use glTF assets * Use glTF assets * Removed license files, will be moved to asset pack * Use RGBA textures * Use RGBA cubemp texture with face assignment based on original images Refs #679 * Android build files * Removed textures All textures will be moved to the asset pack * Ignore asset folders * Removed font Fonts will be moved to the asset pack * Link to gltf asset pack * Updated gitignore * Android build file
2020-07-28 20:20:38 +02:00
shaderStages[0] = loadShader(getShadersPath() + "shadowmappingomni/cubemapdisplay.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
shaderStages[1] = loadShader(getShadersPath() + "shadowmappingomni/cubemapdisplay.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
Much improved cube map visualization Now displays all six cube map faces as a single cross
2019-04-15 21:30:57 +02:00
VkPipelineVertexInputStateCreateInfo emptyInputState = vks::initializers::pipelineVertexInputStateCreateInfo();
Merge glTF branch (#747) * Added helper function for easy pipeline vertex input state create info structure setup from glTF model vertex class * Split glTF loader into header and implementation * Updated sample to use glTF * Removed collada files Replaced assets are now part of the asset pack * Return value for glTF model vertex input state create info helper * Removed unused assets * Use glTF assets * Added default material for glTF node's without materials * Use glTF assets * Apply pre-transforms to normals * Use glTF assets * Use glTF assets * Use vertex input state from glTF model class * Scene setup * Use glTF assets * Use glTF assets * Display error message and exit if glTF file could not be loaded * Use glTF assets * Use glTF assets * Use glTF assets * Remove unused buffer binds * Use glTF assets * Remove no longer used model files * Remove no longer used model files * Added support for rendering glTF models with images * glTF model normal pre-transform ignores translation * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Only add combined image samplers to pool if actually used in the scene * Use global descriptor set layouts * Use global descriptor set layouts * Use glTF assets * Use glTF assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Remove no-longer used model * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used model * Use glTF assets Code cleanup Use RGBA texture instead of different compressed formats Removed no-longer used assets * Adnrdoid build file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders * Added vertex count and way of passing additional memory property type flags to glTF loader * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders * Remove unfinished sample * Completely reworked push constants sample Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Android CMake build files * Removed un-used asset * Explicit buffer binding function * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Removed no-longer used assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used assets * Remove no-longer used asset * Use glTF assets Code cleanup and refactoring Performance optimizations Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Pass vertex size and calculate multiplier in shaders instead of hard-coding With this, changes to the glTF vertex structure won't break the ray tracing samples * Load tangents (if present) * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code * Android build * Normal mapping fixes Udpated HLSL shaders * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Code cleanup, comments * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Added sample count to framebuffer create info * Removed no-longer used assets * Android build Removed no-longer used assets * Code cleanup and heavy refactoring Updated GLSL and HLSL shaders Use tangents stored in GLSL instead of calculating them in the fragment shader * Renamed textured PBR sample main cpp file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Removed no-longer used assets * Android build files * Android build files * Use glTF assets Removed no-longer used assets * Fixed HLSL shaders * Android build files * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Added flag to disable glTF image loading Useful for samples that use their own textures or don't use textures at all to speed up loading * Use glTF assets Code cleanup Use Sponza scene instead of Sibenik to better highlight the effect Updated GLSL and HLSL shaders * Updated Android build files * Removed left-over comment * Use Sponza scene for the SSAO sample * Removed unused code * Removed ASSIMP No longer required as all samples now use the glTF file format * Added missing vertex shader stage * Removed old ASSIMP-based model loader * Added support for loading external glTF images from ktx Android fixes for loading external buffer files * Scene setup * Added missing shader stages * Removed ASSIMP from build files * Fixed compiler warning * Removed ASSIMP from readmes * Android build files cleanup * Replaced ktx submodule with only the files required for this repo The ktx submodule was a tad too big and contained lots of files not required for this repo * Moved ktx build files into base project * Use glTF assets * Use glTF assets * Removed license files, will be moved to asset pack * Use RGBA textures * Use RGBA cubemp texture with face assignment based on original images Refs #679 * Android build files * Removed textures All textures will be moved to the asset pack * Ignore asset folders * Removed font Fonts will be moved to the asset pack * Link to gltf asset pack * Updated gitignore * Android build file
2020-07-28 20:20:38 +02:00
pipelineCI.pVertexInputState = &emptyInputState;
pipelineCI.layout = pipelineLayouts.scene;
pipelineCI.renderPass = renderPass;
rasterizationState.cullMode = VK_CULL_MODE_NONE;
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCI, nullptr, &pipelines.cubemapDisplay));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
}
// Prepare and initialize uniform buffer containing shader uniforms
void prepareUniformBuffers()
{
Move shaders into glsl and hlsl directories Move `data/shaders` to `data/shaders/glsl` Move `data/hlsl` to `data/shaders/hlsl` Fix up shader paths in the cpp files to point to the new glsl location. `data/shaders/hlsl/compile.py` still overwrites the glsl .spv files (for now). Issue: #723
2020-05-29 16:08:53 +01:00
// Offscreen vertex shader uniform buffer
Replaced vkTools::UniformData with newer vk::Buffer for uniform buffers, some renaming, small fixes and corrections
2016-12-24 12:48:01 +01:00
VK_CHECK_RESULT(vulkanDevice->createBuffer(
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
Replaced vkTools::UniformData with newer vk::Buffer for uniform buffers, some renaming, small fixes and corrections
2016-12-24 12:48:01 +01:00
&uniformBuffers.offscreen,
sizeof(uboOffscreenVS)));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
Replaced vkTools::UniformData with newer vk::Buffer for uniform buffers, some renaming, small fixes and corrections
2016-12-24 12:48:01 +01:00
// Scene vertex shader uniform buffer
VK_CHECK_RESULT(vulkanDevice->createBuffer(
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
Replaced vkTools::UniformData with newer vk::Buffer for uniform buffers, some renaming, small fixes and corrections
2016-12-24 12:48:01 +01:00
&uniformBuffers.scene,
sizeof(uboVSscene)));
// Map persistent
VK_CHECK_RESULT(uniformBuffers.offscreen.map());
VK_CHECK_RESULT(uniformBuffers.scene.map());
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
updateUniformBufferOffscreen();
updateUniformBuffers();
}
void updateUniformBuffers()
{
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
uboVSscene.projection = camera.matrices.perspective;
uboVSscene.view = camera.matrices.view;
glm matrix initialization
2017-09-24 18:17:07 +02:00
uboVSscene.model = glm::mat4(1.0f);
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
uboVSscene.lightPos = lightPos;
Replaced vkTools::UniformData with newer vk::Buffer for uniform buffers, some renaming, small fixes and corrections
2016-12-24 12:48:01 +01:00
memcpy(uniformBuffers.scene.mapped, &uboVSscene, sizeof(uboVSscene));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
}
void updateUniformBufferOffscreen()
{
Merge glTF branch (#747) * Added helper function for easy pipeline vertex input state create info structure setup from glTF model vertex class * Split glTF loader into header and implementation * Updated sample to use glTF * Removed collada files Replaced assets are now part of the asset pack * Return value for glTF model vertex input state create info helper * Removed unused assets * Use glTF assets * Added default material for glTF node's without materials * Use glTF assets * Apply pre-transforms to normals * Use glTF assets * Use glTF assets * Use vertex input state from glTF model class * Scene setup * Use glTF assets * Use glTF assets * Display error message and exit if glTF file could not be loaded * Use glTF assets * Use glTF assets * Use glTF assets * Remove unused buffer binds * Use glTF assets * Remove no longer used model files * Remove no longer used model files * Added support for rendering glTF models with images * glTF model normal pre-transform ignores translation * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Use glTF assets * Only add combined image samplers to pool if actually used in the scene * Use global descriptor set layouts * Use global descriptor set layouts * Use glTF assets * Use glTF assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Remove no-longer used model * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used model * Use glTF assets Code cleanup Use RGBA texture instead of different compressed formats Removed no-longer used assets * Adnrdoid build file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders * Added vertex count and way of passing additional memory property type flags to glTF loader * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders * Remove unfinished sample * Completely reworked push constants sample Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Android CMake build files * Removed un-used asset * Explicit buffer binding function * Use glTF assets Code cleanup Updated GLSL and HLSL shaders * Use glTF assets Code cleanup * Use glTF assets Code cleanup Removed no-longer used assets * Use glTF assets Code cleanup Updated GLSL and HLSL shaders Removed no-longer used assets * Remove no-longer used asset * Use glTF assets Code cleanup and refactoring Performance optimizations Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring * Use glTF assets Code cleanup and refactoring Removed no-longer used assets * Pass vertex size and calculate multiplier in shaders instead of hard-coding With this, changes to the glTF vertex structure won't break the ray tracing samples * Load tangents (if present) * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code * Android build * Normal mapping fixes Udpated HLSL shaders * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Code cleanup, comments * Use glTF assets Code cleanup and heavy refactoring Reworked debug display code Updated GLSL and HLSL shaders * Added sample count to framebuffer create info * Removed no-longer used assets * Android build Removed no-longer used assets * Code cleanup and heavy refactoring Updated GLSL and HLSL shaders Use tangents stored in GLSL instead of calculating them in the fragment shader * Renamed textured PBR sample main cpp file * Use glTF assets Code cleanup and refactoring Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Removed no-longer used assets * Android build files * Android build files * Use glTF assets Removed no-longer used assets * Fixed HLSL shaders * Android build files * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Use glTF assets Updated GLSL and HLSL shaders Removed no-longer used assets * Added flag to disable glTF image loading Useful for samples that use their own textures or don't use textures at all to speed up loading * Use glTF assets Code cleanup Use Sponza scene instead of Sibenik to better highlight the effect Updated GLSL and HLSL shaders * Updated Android build files * Removed left-over comment * Use Sponza scene for the SSAO sample * Removed unused code * Removed ASSIMP No longer required as all samples now use the glTF file format * Added missing vertex shader stage * Removed old ASSIMP-based model loader * Added support for loading external glTF images from ktx Android fixes for loading external buffer files * Scene setup * Added missing shader stages * Removed ASSIMP from build files * Fixed compiler warning * Removed ASSIMP from readmes * Android build files cleanup * Replaced ktx submodule with only the files required for this repo The ktx submodule was a tad too big and contained lots of files not required for this repo * Moved ktx build files into base project * Use glTF assets * Use glTF assets * Removed license files, will be moved to asset pack * Use RGBA textures * Use RGBA cubemp texture with face assignment based on original images Refs #679 * Android build files * Removed textures All textures will be moved to the asset pack * Ignore asset folders * Removed font Fonts will be moved to the asset pack * Link to gltf asset pack * Updated gitignore * Android build file
2020-07-28 20:20:38 +02:00
lightPos.x = sin(glm::radians(timer * 360.0f)) * 0.15f;
lightPos.z = cos(glm::radians(timer * 360.0f)) * 0.15f;
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
uboOffscreenVS.projection = glm::perspective((float)(M_PI / 2.0), 1.0f, zNear, zFar);
glm matrix initialization
2017-09-24 18:17:07 +02:00
uboOffscreenVS.view = glm::mat4(1.0f);
uboOffscreenVS.model = glm::translate(glm::mat4(1.0f), glm::vec3(-lightPos.x, -lightPos.y, -lightPos.z));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
uboOffscreenVS.lightPos = lightPos;
Replaced vkTools::UniformData with newer vk::Buffer for uniform buffers, some renaming, small fixes and corrections
2016-12-24 12:48:01 +01:00
memcpy(uniformBuffers.offscreen.mapped, &uboOffscreenVS, sizeof(uboOffscreenVS));
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
}
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
void draw()
{
VulkanExampleBase::prepareFrame();
Additional semaphore to synchronize offscreen and final render
2016-06-05 16:59:01 +02:00
submitInfo.commandBufferCount = 1;
submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer];
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
VK_CHECK_RESULT(vkQueueSubmit(queue, 1, &submitInfo, VK_NULL_HANDLE));
VulkanExampleBase::submitFrame();
}
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
void prepare()
{
VulkanExampleBase::prepare();
Use offscreen render pass, refactoring and cleanup
2016-08-13 20:35:22 +02:00
loadAssets();
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
prepareUniformBuffers();
prepareCubeMap();
setupDescriptorSetLayout();
Make shadowmappingomni demo spec compliant. It's illegal to use the same renderpass for rendering to a framebuffer with different format (the offscreen one in this case). Added a prepareOffscreenRenderpass function that creates a new renderpass with the correct formats, and changed the vkCreateGraphicsPipelines and vkCreateFramebuffer calls to use this one.
2016-05-17 15:52:33 +01:00
prepareOffscreenRenderpass();
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
preparePipelines();
setupDescriptorPool();
setupDescriptorSets();
prepareOffscreenFramebuffer();
buildCommandBuffers();
prepared = true;
}
virtual void render()
{
if (!prepared)
return;
draw();
Replace dedicated offscreen command buffer and complicated synchronization with single command buffer and sync via sub pass dependencies Proper stage and access masks Code cleanup
2019-04-14 19:38:30 +02:00
if (!paused || camera.updated)
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
{
updateUniformBufferOffscreen();
updateUniformBuffers();
}
}
Replaced text overlay with proper UI overlay
2017-11-01 14:22:10 +01:00
virtual void OnUpdateUIOverlay(vks::UIOverlay *overlay)
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
{
Replaced text overlay with proper UI overlay
2017-11-01 14:22:10 +01:00
if (overlay->header("Settings")) {
if (overlay->checkBox("Display shadow cube render target", &displayCubeMap)) {
buildCommandBuffers();
}
Enabled text overlay, code cleanup, refactoring, gl_PerVertex output for shaders
2016-05-31 20:07:43 +02:00
}
}
Added Vulkan examples sources!
2016-02-16 15:07:25 +01:00
};
Replaced main entry points with macro from example base
2016-12-13 19:25:56 +01:00
VULKAN_EXAMPLE_MAIN()
Reference in a new issue Copy permalink