clara/bluenoise-raytracer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing many links issues.

Browse source 
Corrected shaders
This commit is contained in:
mklefrancois 2020-03-31 18:35:37 +02:00
parent b6402f0c09
commit 95912b873b
32 changed files with 135 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ray_tracing_callable/README.md
View file

@ -1,5 +1,5 @@
# NVIDIA Vulkan Ray Tracing Tutorial
[Start the tutorial of this project](https://nvpro-samples.github.io/vk_raytracing_tutorial/vkrt_tuto_callable.md.html)
[Start the tutorial of this project](https://nvpro-samples.github.io/vk_raytracing_tutorial_KHR/vkrt_tuto_callable.md.html)
![](../docs/Images/callable.png)

6
ray_tracing_callable/hello_vulkan.cpp
View file

@ -804,13 +804,13 @@ void HelloVulkan::createRtPipeline()
nvvkpp::util::createShaderModule(m_device,
nvh::loadFile("shaders/light_inf.rcall.spv", true, paths));
stages.push_back({{}, vk::ShaderStageFlagBits::eCallableNV, call0, "main"});
stages.push_back({{}, vk::ShaderStageFlagBits::eCallableKHR, call0, "main"});
callGroup.setGeneralShader(static_cast<uint32_t>(stages.size() - 1));
m_rtShaderGroups.push_back(callGroup);
stages.push_back({{}, vk::ShaderStageFlagBits::eCallableNV, call1, "main"});
stages.push_back({{}, vk::ShaderStageFlagBits::eCallableKHR, call1, "main"});
callGroup.setGeneralShader(static_cast<uint32_t>(stages.size() - 1));
m_rtShaderGroups.push_back(callGroup);
stages.push_back({{}, vk::ShaderStageFlagBits::eCallableNV, call2, "main"});
stages.push_back({{}, vk::ShaderStageFlagBits::eCallableKHR, call2, "main"});
callGroup.setGeneralShader(static_cast<uint32_t>(stages.size() - 1));
m_rtShaderGroups.push_back(callGroup);

4
ray_tracing_callable/shaders/light_inf.rcall
View file

@ -1,9 +1,9 @@
#version 460 core
#extension GL_NV_ray_tracing : enable
#extension GL_EXT_ray_tracing : enable
#extension GL_GOOGLE_include_directive : enable
#include "raycommon.glsl"
layout(location = 0) callableDataInNV rayLight cLight;
layout(location = 0) callableDataInEXT rayLight cLight;
layout(push_constant) uniform Constants
{

4
ray_tracing_callable/shaders/light_point.rcall
View file

@ -1,9 +1,9 @@
#version 460 core
#extension GL_NV_ray_tracing : enable
#extension GL_EXT_ray_tracing : enable
#extension GL_GOOGLE_include_directive : enable
#include "raycommon.glsl"
layout(location = 0) callableDataInNV rayLight cLight;
layout(location = 0) callableDataInEXT rayLight cLight;
layout(push_constant) uniform Constants
{

4
ray_tracing_callable/shaders/light_spot.rcall
View file

@ -1,9 +1,9 @@
#version 460 core
#extension GL_NV_ray_tracing : enable
#extension GL_EXT_ray_tracing : enable
#extension GL_GOOGLE_include_directive : enable
#include "raycommon.glsl"
layout(location = 0) callableDataInNV rayLight cLight;
layout(location = 0) callableDataInEXT rayLight cLight;
layout(push_constant) uniform Constants
{