Mark all TLAS instances opaque

sergcpp · Apr 6, 2024 · 1ce0d01 · 1ce0d01
1 parent d34b901
commit 1ce0d01
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 47 deletions.
diff --git a/internal/SceneDX.cpp b/internal/SceneDX.cpp
@@ -325,7 +325,7 @@ void Ray::Dx::Scene::Rebuild_HWRT_TLAS_nolock() {
         new_instance.InstanceID = meshes_[instance.mesh_index].vert_index / 3;
         new_instance.InstanceMask = (instance.ray_visibility & 0xff);
         new_instance.InstanceContributionToHitGroupIndex = 0;
-        new_instance.Flags = 0;
+        new_instance.Flags = D3D12_RAYTRACING_INSTANCE_FLAG_FORCE_OPAQUE;
         new_instance.AccelerationStructure = dx_blas.gpu_virtual_address();
 
         // const mesh_t &mesh = meshes_[instance.mesh_index];

diff --git a/internal/SceneVK.cpp b/internal/SceneVK.cpp
@@ -505,12 +505,9 @@ void Ray::Vk::Scene::Rebuild_HWRT_TLAS_nolock() {
         auto &new_instance = tlas_instances.back();
         to_khr_xform(instance.xform, new_instance.transform.matrix);
         new_instance.instanceCustomIndex = m.vert_index / 3;
-        // blas.geo_index;
         new_instance.mask = (instance.ray_visibility & 0xff);
         new_instance.instanceShaderBindingTableRecordOffset = 0;
-        new_instance.flags = 0;
-        // VK_GEOMETRY_INSTANCE_TRIANGLE_FRONT_COUNTERCLOCKWISE_BIT_KHR; //
-        // VK_GEOMETRY_INSTANCE_TRIANGLE_FACING_CULL_DISABLE_BIT_KHR;
+        new_instance.flags = VK_GEOMETRY_INSTANCE_FORCE_OPAQUE_BIT_KHR;
         new_instance.accelerationStructureReference = static_cast<uint64_t>(vk_blas.vk_device_address());
 
         // const mesh_t &mesh = meshes_[instance.mesh_index];

diff --git a/internal/shaders/intersect_scene.comp.glsl b/internal/shaders/intersect_scene.comp.glsl
@@ -225,7 +225,7 @@ void main() {
                               inter.t           // tMax
                              );
         while (rayQueryProceedEXT(rq)) {
-            rayQueryConfirmIntersectionEXT(rq);
+            // NOTE: All instances are opaque, no need to confirm intersection
         }
 
         if (rayQueryGetIntersectionTypeEXT(rq, true) != gl_RayQueryCommittedIntersectionNoneEXT) {

diff --git a/internal/shaders/intersect_scene_shadow.comp.glsl b/internal/shaders/intersect_scene_shadow.comp.glsl
@@ -291,11 +291,8 @@ vec3 IntersectSceneShadow(shadow_ray_t r) {
                               rd,                       // direction
                               dist                      // tMax
                               );
-
-        while(rayQueryProceedEXT(rq)) {
-            if (rayQueryGetIntersectionTypeEXT(rq, false) == gl_RayQueryCandidateIntersectionTriangleEXT) {
-                rayQueryConfirmIntersectionEXT(rq);
-            }
+        while (rayQueryProceedEXT(rq)) {
+            // NOTE: All instances are opaque, no need to confirm intersection
         }
 
         if (rayQueryGetIntersectionTypeEXT(rq, true) != gl_RayQueryCommittedIntersectionNoneEXT) {

diff --git a/internal/shaders/output/intersect_scene_hwrt_atlas.comp.cso.inl b/internal/shaders/output/intersect_scene_hwrt_atlas.comp.cso.inl
diff --git a/internal/shaders/output/intersect_scene_hwrt_atlas.comp.spv.inl b/internal/shaders/output/intersect_scene_hwrt_atlas.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_hwrt_bindless.comp.cso.inl b/internal/shaders/output/intersect_scene_hwrt_bindless.comp.cso.inl
diff --git a/internal/shaders/output/intersect_scene_hwrt_bindless.comp.spv.inl b/internal/shaders/output/intersect_scene_hwrt_bindless.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_indirect_hwrt_atlas.comp.cso.inl b/internal/shaders/output/intersect_scene_indirect_hwrt_atlas.comp.cso.inl
diff --git a/internal/shaders/output/intersect_scene_indirect_hwrt_atlas.comp.spv.inl b/internal/shaders/output/intersect_scene_indirect_hwrt_atlas.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_indirect_hwrt_bindless.comp.cso.inl b/internal/shaders/output/intersect_scene_indirect_hwrt_bindless.comp.cso.inl
diff --git a/internal/shaders/output/intersect_scene_indirect_hwrt_bindless.comp.spv.inl b/internal/shaders/output/intersect_scene_indirect_hwrt_bindless.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_shadow_hwrt_atlas.comp.cso.inl b/internal/shaders/output/intersect_scene_shadow_hwrt_atlas.comp.cso.inl
diff --git a/internal/shaders/output/intersect_scene_shadow_hwrt_atlas.comp.spv.inl b/internal/shaders/output/intersect_scene_shadow_hwrt_atlas.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_shadow_hwrt_bindless.comp.cso.inl b/internal/shaders/output/intersect_scene_shadow_hwrt_bindless.comp.cso.inl
diff --git a/internal/shaders/output/intersect_scene_shadow_hwrt_bindless.comp.spv.inl b/internal/shaders/output/intersect_scene_shadow_hwrt_bindless.comp.spv.inl