Skip to content

Hardcode fix for RT #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JMS55 wants to merge 3 commits into from
Closed

Hardcode fix for RT #116

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82476f8
Hardcode fix for RT
JMS55 Apr 7, 2025
620d6e4
Merge branch 'master' into solari6
JMS55 Apr 29, 2025
e42ac53
Fix tests by gating ray query code
JMS55 May 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/compose/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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);
Expand Down