diff --git a/src/compose/mod.rs b/src/compose/mod.rs
index 754d74a..d7e9a48 100644
--- a/src/compose/mod.rs
+++ b/src/compose/mod.rs
@@ -127,7 +127,7 @@ use indexmap::IndexMap;
 ///
 /// codespan reporting for errors is available using the error `emit_to_string` method. this requires validation to be enabled, which is true by default. `Composer::non_validating()` produces a non-validating composer that is not able to give accurate error reporting.
 ///
-use naga::EntryPoint;
+use naga::{valid::Capabilities, EntryPoint};
 use regex::Regex;
 use std::collections::{hash_map::Entry, BTreeMap, HashMap, HashSet};
 use tracing::{debug, trace};
@@ -1797,6 +1797,11 @@ impl Composer {
             ..derived.into()
         };
 
+        if self.capabilities.contains(Capabilities::RAY_QUERY) {
+            naga_module.generate_ray_desc_type();
+            naga_module.generate_ray_intersection_type();
+        }
+
         // apply overrides
         if !composable.override_functions.is_empty() {
             let mut redirect = Redirector::new(naga_module);