Skip to content

Update 17 05 #129

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

Merged
merged 2 commits into from
May 17, 2025
Merged

Update 17 05 #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ffb856
Properly mask out unsupported stage
sergcpp May 11, 2025
3fdd5bf
Minor refactoring
sergcpp May 17, 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
4 changes: 2 additions & 2 deletions internal/PMJ.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void Ray::GetValidOffsets(const int x_pos, const int y_pos, const std::vector<st
GetValidXOffsets(x_pos, y_pos / 2, int(strata.size() / 2 - 1), strata, x_offsets);
GetValidYOffsets(x_pos / 2, y_pos, int(strata.size() / 2), strata, y_offsets);
}
};
}

Ray::aligned_vector<Ray::Ref::dvec2> Ray::GeneratePMJSamples(const unsigned int seed, const int sample_count,
const int candidates_count) {
Expand Down Expand Up @@ -110,7 +110,7 @@ Ray::aligned_vector<Ray::Ref::dvec2> Ray::GeneratePMJSamples(const unsigned int
std::vector<int> valid_offsets_x, valid_offsets_y;
GetValidOffsets(x_pos, y_pos, strata, valid_offsets_x, valid_offsets_y);

if (candidates == 1 && false) {
if (candidates == 1) {
return get_sample_candidate(valid_offsets_x, valid_offsets_y);
} else {
Ref::dvec2 best_candidate = {};
Expand Down
5 changes: 4 additions & 1 deletion internal/Vk/ContextVK.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,13 @@ bool Ray::Vk::Context::Init(ILog *log, const VulkanDevice &vk_device, const Vulk
raytracing_supported_, ray_query_supported_, fp16_supported_, int64_supported_,
int64_atomics_supported_, coop_matrix_supported_, pageable_memory_supported_);

// mask out unsupported stages
if (!raytracing_supported_) {
// mask out unsupported stage
supported_stages_mask_ &= ~VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR;
}
if (!raytracing_supported_ && !ray_query_supported_) {
supported_stages_mask_ &= ~VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR;
}

if (!external_ && !InitVkDevice(api_, device_, physical_device_, graphics_family_index_, raytracing_supported_,
ray_query_supported_, fp16_supported_, int64_supported_, int64_atomics_supported_,
Expand Down