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

Merge branch 'sascha_master'

Browse source
This commit is contained in:
n8vm 2022-09-25 13:43:24 -06:00
commit e8270a7b38
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/shaders/glsl/rayquery/scene.frag
View file

@ -25,7 +25,7 @@ void main()
outFragColor = vec4(diffuse, 1.0); outFragColor = vec4(diffuse, 1.0);
rayQueryEXT rayQuery; rayQueryEXT rayQuery;
rayQueryInitializeEXT(rayQuery, topLevelAS, gl_RayFlagsTerminateOnFirstHitEXT | gl_RayFlagsSkipAABBEXT, 0xFF, inWorldPos, 0.01, L, 1000.0); rayQueryInitializeEXT(rayQuery, topLevelAS, gl_RayFlagsTerminateOnFirstHitEXT, 0xFF, inWorldPos, 0.01, L, 1000.0);
// Traverse the acceleration structure and store information about the first intersection (if any) // Traverse the acceleration structure and store information about the first intersection (if any)
rayQueryProceedEXT(rayQuery); rayQueryProceedEXT(rayQuery);

BIN
data/shaders/glsl/rayquery/scene.frag.spv
View file

Binary file not shown.

9
examples/rayquery/rayquery.cpp
View file

@ -1,7 +1,7 @@
/* /*
* Vulkan Example - Using ray queries for hardware accelerated ray tracing queries in a fragment shader * Vulkan Example - Using ray queries for hardware accelerated ray tracing queries in a fragment shader
* *
* Copyright (C) 2020 by Sascha Willems - www.saschawillems.de * Copyright (C) 2020-2022 by Sascha Willems - www.saschawillems.de
* *
* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
*/ */
@ -289,11 +289,10 @@ public:
void setupDescriptorPool() void setupDescriptorPool()
{ {
std::vector<VkDescriptorPoolSize> poolSizes = { std::vector<VkDescriptorPoolSize> poolSizes = {
vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 3), vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1),
vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 3), vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR, 1)
vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR, 3)
}; };
VkDescriptorPoolCreateInfo descriptorPoolInfo = vks::initializers::descriptorPoolCreateInfo(poolSizes, 3); VkDescriptorPoolCreateInfo descriptorPoolInfo = vks::initializers::descriptorPoolCreateInfo(poolSizes, 1);
VK_CHECK_RESULT(vkCreateDescriptorPool(device, &descriptorPoolInfo, nullptr, &descriptorPool)); VK_CHECK_RESULT(vkCreateDescriptorPool(device, &descriptorPoolInfo, nullptr, &descriptorPool));
} }