Skip to content

Fix SampleExtComputationInput() for non-varying computation inputs. #3704

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
cameronwhite wants to merge 1 commit into from
Closed

Fix SampleExtComputationInput() for non-varying computation inputs. #3704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 20 additions & 7 deletions pxr/imaging/hd/sceneIndexAdapterSceneDelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2736,21 +2736,34 @@ HdSceneIndexAdapterSceneDelegate::SampleExtComputationInput(
valueDs->GetContributingSampleTimesForInterval(
std::numeric_limits<float>::lowest(),
std::numeric_limits<float>::max(), &times);

// XXX fallback to include a single sample
if (times.empty()) {
times.push_back(0.0f);
}
} else {
valueDs->GetContributingSampleTimesForInterval(
const bool isVarying =
valueDs->GetContributingSampleTimesForInterval(
startTime, endTime, &times);
if (isVarying) {
if (times.empty()) {
TF_CODING_ERROR("No contributing sample times returned for "
"%s %s even though "
"GetContributingSampleTimesForInterval "
"indicated otherwise.",
computationId.GetText(), input.GetText());
times.push_back(0.0f);
}
} else {
times = { 0.0f };
}
}

size_t authoredSamples = times.size();
const size_t authoredSamples = times.size();
if (authoredSamples > maxSampleCount) {
times.resize(maxSampleCount);
}

// XXX fallback to include a single sample
if (times.empty()) {
times.push_back(0.0f);
}

for (size_t i = 0; i < times.size(); ++i) {
sampleTimes[i] = times[i];
sampleValues[i] = valueDs->GetValue(times[i]);
Expand Down
Loading