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

Merge branch 'master' of https://github.com/SaschaWillems/Vulkan

Browse source
This commit is contained in:
Sascha Willems 2022-04-21 07:35:01 +02:00
commit e8596963b3
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
base/VulkanglTFModel.cpp
View file

@ -273,6 +273,10 @@ void vkglTF::Texture::fromglTfImage(tinygltf::Image &gltfimage, std::string path
vkCmdPipelineBarrier(blitCmd, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, 0, nullptr, 0, nullptr, 1, &imageMemoryBarrier); vkCmdPipelineBarrier(blitCmd, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, 0, nullptr, 0, nullptr, 1, &imageMemoryBarrier);
} }
if (deleteBuffer) {
delete[] buffer;
}
device->flushCommandBuffer(blitCmd, copyQueue, true); device->flushCommandBuffer(blitCmd, copyQueue, true);
} }
else { else {

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

@ -25,10 +25,10 @@ void main()
outFragColor = vec4(diffuse, 1.0); outFragColor = vec4(diffuse, 1.0);
rayQueryEXT rayQuery; rayQueryEXT rayQuery;
rayQueryInitializeEXT(rayQuery, topLevelAS, gl_RayFlagsTerminateOnFirstHitEXT, 0xFF, inWorldPos, 0.01, L, 1000.0); rayQueryInitializeEXT(rayQuery, topLevelAS, gl_RayFlagsTerminateOnFirstHitEXT | gl_RayFlagsSkipAABBEXT, 0xFF, inWorldPos, 0.01, L, 1000.0);
// Start the ray traversal, rayQueryProceedEXT returns false if the traversal is complete // Traverse the acceleration structure and store information about the first intersection (if any)
while (rayQueryProceedEXT(rayQuery)) { } rayQueryProceedEXT(rayQuery);
// If the intersection has hit a triangle, the fragment is shadowed // If the intersection has hit a triangle, the fragment is shadowed
if (rayQueryGetIntersectionTypeEXT(rayQuery, true) == gl_RayQueryCommittedIntersectionTriangleEXT ) { if (rayQueryGetIntersectionTypeEXT(rayQuery, true) == gl_RayQueryCommittedIntersectionTriangleEXT ) {