[Raytracing] Add duplication checks in effect builders

krauthaufen · Aug 31, 2023 · 85d7c8d · 85d7c8d
1 parent 6b7b996
commit 85d7c8d
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/src/Libs/FShade.Core/RaytracingEffect.fs b/src/Libs/FShade.Core/RaytracingEffect.fs
@@ -221,10 +221,16 @@ module RaytracingBuilders =
             if shader.Stage <> stage then
                 failwithf "[FShade] Expected %A shader but got %A shader." stage shader.Stage
 
+            let add (map : Map<Symbol, RaytracingShader>) =
+                if map.ContainsKey rayType then
+                    failwithf "[FShade] Cannot set multiple %A shaders for ray type %A." stage rayType
+
+                map |> Map.add rayType shader
+
             match stage with
-            | ShaderStage.AnyHit     -> { group with AnyHit       = group.AnyHit       |> Map.add rayType shader }
-            | ShaderStage.ClosestHit -> { group with ClosestHit   = group.ClosestHit   |> Map.add rayType shader }
-            | _                      -> { group with Intersection = group.Intersection |> Map.add rayType shader }
+            | ShaderStage.AnyHit     -> { group with AnyHit       = add group.AnyHit }
+            | ShaderStage.ClosestHit -> { group with ClosestHit   = add group.ClosestHit }
+            | _                      -> { group with Intersection = add group.Intersection }
 
 
         [<CustomOperation("anyHit")>]
@@ -435,6 +441,9 @@ module RaytracingBuilders =
             if shader.Stage <> stage then
                 failwithf "[FShade] Expected %A shader but got %A shader." stage shader.Stage
 
+            if shaders.ContainsKey slot then
+                failwithf "[FShade] Cannot set multiple shaders for slot %A." slot
+
             shaders |> Map.add slot shader
 
         [<CustomOperation("raygen")>]
@@ -576,6 +585,13 @@ module RaytracingBuilders =
         member x.HitGroup(shaders : Map<ShaderSlot, RaytracingShader>, name : Symbol, group : HitGroup) =
             let mutable shaders = shaders
 
+            for slot in Map.keys shaders do
+                match slot with
+                | ShaderSlot.AnyHit (group, _) | ShaderSlot.ClosestHit (group, _) | ShaderSlot.Intersection (group, _) when group = name ->
+                    failwithf "[FShade] Cannot set multiple hit groups with name %A." name
+                | _ ->
+                    ()
+
             for KeyValue(ray, shader) in group.AnyHit do
                 shaders <- shaders |> Map.add (ShaderSlot.AnyHit (name, ray)) shader