Skip to content
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

Jump to bottom

Share mesh buffers with arnold core #2148

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Share mesh buffers with arnold core #2148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
222af5b
shared (foreign) arrays wip
cpichard Oct 15, 2024
d65584c
testsuite now passing in hydra mode
cpichard Oct 16, 2024
8e7b9ff
remove iostream and add deletion of points
cpichard Oct 17, 2024
73716a7
test buffer holder to benefit from usd deduplication
cpichard Oct 17, 2024
47c57be
cache the shared AtArray for deduplication
cpichard Oct 18, 2024
10e0e8d
rename AiArrayMakeSharedXXX to AiArrayMakeShared
cpichard Nov 8, 2024
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
8 changes: 4 additions & 4 deletions libs/common/shape_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,9 @@ AtArray* GenerateVertexIdxs(const VtIntArray& indices, AtArray* vidxs)
return AiArrayCopy(vidxs);

const auto numIdxs = static_cast<uint32_t>(AiArrayGetNumElements(vidxs));
auto* array = AiArrayAllocate(numIdxs, 1, AI_TYPE_UINT);
auto* out = static_cast<uint32_t*>(AiArrayMap(array));
auto* in = static_cast<uint32_t*>(AiArrayMap(vidxs));
AtArray* array = AiArrayAllocate(numIdxs, 1, AI_TYPE_UINT);
uint32_t* out = static_cast<uint32_t*>(AiArrayMap(array));
const uint32_t* in = static_cast<const uint32_t*>(AiArrayMapConst(vidxs));

for (unsigned int i = 0; i < numIdxs; ++i) {
if (in[i] >= indices.size()) {
Expand All @@ -288,7 +288,7 @@ AtArray* GenerateVertexIdxs(const VtIntArray& indices, AtArray* vidxs)
}

AiArrayUnmap(array);
AiArrayUnmap(vidxs);
AiArrayUnmapConst(vidxs);
return array;
}

Expand Down
334 changes: 287 additions & 47 deletions libs/render_delegate/mesh.cpp
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion libs/render_delegate/mesh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ class HdArnoldMesh : public HdArnoldRprim<HdMesh> {

HdArnoldPrimvarMap _primvars; ///< Precomputed list of primvars.
HdArnoldSubsets _subsets; ///< Material ids from subsets.
VtIntArray _vertexCounts; ///< Vertex Counts array for reversing vertex and primvar polygon order.
VtValue _vertexCountsVtValue; ///< Vertex nsides
VtValue _vertexIndicesVtValue;
size_t _vertexCountSum = 0; ///< Sum of the vertex counts array.
size_t _numberOfPositionKeys = 1; ///< Number of vertex position keys for the mesh.
AtNode *_geometryLight = nullptr; ///< Eventual mesh light for this polymesh
Expand Down
213 changes: 106 additions & 107 deletions libs/render_delegate/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,114 +77,8 @@ inline bool _TokenStartsWithToken(const TfToken& t0, const TfToken& t1)
return strncmp(t0.GetText(), t1.GetText(), t1.size()) == 0;
}

inline size_t _ExtrapolatePositions(
AtNode* node, const AtString& paramName, HdArnoldSampledType<VtVec3fArray>& xf, const HdArnoldRenderParam* param,
int deformKeys, const HdArnoldPrimvarMap* primvars)
{
// If velocity or acceleration primvars are present, we want to use them to extrapolate
// the positions for motion blur, instead of relying on positions at different time samples.
// This allow to support varying topologies with motion blur
if (primvars == nullptr || Ai_unlikely(param == nullptr) || param->InstananeousShutter()) {
return 0;
}

// Check if primvars or positions exists. These arrays are COW.
VtVec3fArray emptyVelocities;
VtVec3fArray emptyAccelerations;
auto primvarIt = primvars->find(HdTokens->velocities);
const VtVec3fArray& velocities = (primvarIt != primvars->end() && primvarIt->second.value.IsHolding<VtVec3fArray>())
? primvarIt->second.value.UncheckedGet<VtVec3fArray>()
: emptyVelocities;

primvarIt = primvars->find(HdTokens->accelerations);
const VtVec3fArray& accelerations =
(primvarIt != primvars->end() && primvarIt->second.value.IsHolding<VtVec3fArray>())
? primvarIt->second.value.UncheckedGet<VtVec3fArray>()
: emptyAccelerations;

// The positions in xf contain several several time samples, but the amount of vertices
// can change in each sample. We want to consider the positions at the proper time, so
// that we can apply the velocities/accelerations
// First, let's check if one of the times is 0 (current frame)
int timeIndex = -1;
for (size_t i = 0; i < xf.times.size(); ++i) {
if (xf.times[i] == 0) {
timeIndex = i;
break;
}
}
// If no proper time was found, let's pick the first sample that has the same
// size as the velocities
size_t velocitiesSize = velocities.size();
if (timeIndex < 0) {
for (size_t i = 0; i < xf.values.size(); ++i) {
if (velocitiesSize > 0 && xf.values[i].size() == velocitiesSize) {
timeIndex = i;
break;
}
}
}
// If we still couldn't find a proper time, let's pick the first sample that has the same
// size as the accelerations
size_t accelerationsSize = accelerations.size();
if (timeIndex < 0) {
for (size_t i = 0; i < xf.values.size(); ++i) {
if (accelerationsSize > 0 && xf.values[i].size() == accelerationsSize) {
timeIndex = i;
break;
}
}
}

if (timeIndex < 0)
return 0; // We couldn't find a proper time sample to read positions

const auto& positions = xf.values[timeIndex];
const auto numPositions = positions.size();
const auto hasVelocity = !velocities.empty() && numPositions == velocities.size();
const auto hasAcceleration = !accelerations.empty() && numPositions == accelerations.size();

if (!hasVelocity && !hasAcceleration) {
// No velocity or acceleration, or incorrect sizes for both.
return 0;
}
const auto& t0 = xf.times[timeIndex];
auto shutter = param->GetShutterRange();
const auto numKeys = hasAcceleration ? deformKeys : std::min(2, deformKeys);
TfSmallVector<float, HD_ARNOLD_DEFAULT_PRIMVAR_SAMPLES> times;
times.resize(numKeys);
if (numKeys == 1) {
times[0] = 0.0;
} else {
times[0] = shutter[0];
for (auto i = decltype(numKeys){1}; i < numKeys - 1; i += 1) {
times[i] = AiLerp(static_cast<float>(i) / static_cast<float>(numKeys - 1), shutter[0], shutter[1]);
}
times[numKeys - 1] = shutter[1];
}
const auto fps = 1.0f / param->GetFPS();
const auto fps2 = fps * fps;
auto* array = AiArrayAllocate(numPositions, numKeys, AI_TYPE_VECTOR);
if (numPositions > 0 && numKeys > 0) {
auto* data = reinterpret_cast<GfVec3f*>(AiArrayMap(array));
for (auto pid = decltype(numPositions){0}; pid < numPositions; pid += 1) {
const auto p = positions[pid];
const auto v = hasVelocity ? velocities[pid] * fps : GfVec3f{0.0f};
const auto a = hasAcceleration ? accelerations[pid] * fps2 : GfVec3f{0.0f};
for (auto tid = decltype(numKeys){0}; tid < numKeys; tid += 1) {
const auto t = t0 + times[tid];
data[pid + tid * numPositions] = p + (v + a * t * 0.5f) * t;
}
}
AiArrayUnmap(array);
}
AiNodeSetArray(node, paramName, array);
return numKeys;
}

} // namespace


void HdArnoldSetTransform(AtNode* node, HdSceneDelegate* sceneDelegate, const SdfPath& id)
{
HdArnoldSampledMatrixType xf{};
Expand Down Expand Up @@ -561,7 +455,7 @@ size_t HdArnoldSetPositionFromPrimvar(
return 0;
}
// Check if we can/should extrapolate positions based on velocities/accelerations.
const auto extrapolatedCount = _ExtrapolatePositions(node, paramName, xf, param, deformKeys, primvars);
const auto extrapolatedCount = ExtrapolatePositions(node, paramName, xf, param, deformKeys, primvars);
if (extrapolatedCount != 0) {
return extrapolatedCount;
}
Expand Down Expand Up @@ -811,4 +705,109 @@ AtArray* HdArnoldGetShidxs(const HdGeomSubsets& subsets, int numFaces, HdArnoldS
return shidxsArray;
}

size_t ExtrapolatePositions(
AtNode* node, const AtString& paramName, HdArnoldSampledType<VtVec3fArray>& xf, const HdArnoldRenderParam* param,
int deformKeys, const HdArnoldPrimvarMap* primvars)
{
// If velocity or acceleration primvars are present, we want to use them to extrapolate
// the positions for motion blur, instead of relying on positions at different time samples.
// This allow to support varying topologies with motion blur
if (primvars == nullptr || Ai_unlikely(param == nullptr) || param->InstananeousShutter()) {
return 0;
}

// Check if primvars or positions exists. These arrays are COW.
VtVec3fArray emptyVelocities;
VtVec3fArray emptyAccelerations;
auto primvarIt = primvars->find(HdTokens->velocities);
const VtVec3fArray& velocities = (primvarIt != primvars->end() && primvarIt->second.value.IsHolding<VtVec3fArray>())
? primvarIt->second.value.UncheckedGet<VtVec3fArray>()
: emptyVelocities;

primvarIt = primvars->find(HdTokens->accelerations);
const VtVec3fArray& accelerations =
(primvarIt != primvars->end() && primvarIt->second.value.IsHolding<VtVec3fArray>())
? primvarIt->second.value.UncheckedGet<VtVec3fArray>()
: emptyAccelerations;

// The positions in xf contain several several time samples, but the amount of vertices
// can change in each sample. We want to consider the positions at the proper time, so
// that we can apply the velocities/accelerations
// First, let's check if one of the times is 0 (current frame)
int timeIndex = -1;
for (size_t i = 0; i < xf.times.size(); ++i) {
if (xf.times[i] == 0) {
timeIndex = i;
break;
}
}
// If no proper time was found, let's pick the first sample that has the same
// size as the velocities
size_t velocitiesSize = velocities.size();
if (timeIndex < 0) {
for (size_t i = 0; i < xf.values.size(); ++i) {
if (velocitiesSize > 0 && xf.values[i].size() == velocitiesSize) {
timeIndex = i;
break;
}
}
}
// If we still couldn't find a proper time, let's pick the first sample that has the same
// size as the accelerations
size_t accelerationsSize = accelerations.size();
if (timeIndex < 0) {
for (size_t i = 0; i < xf.values.size(); ++i) {
if (accelerationsSize > 0 && xf.values[i].size() == accelerationsSize) {
timeIndex = i;
break;
}
}
}

if (timeIndex < 0)
return 0; // We couldn't find a proper time sample to read positions

const auto& positions = xf.values[timeIndex];
const auto numPositions = positions.size();
const auto hasVelocity = !velocities.empty() && numPositions == velocities.size();
const auto hasAcceleration = !accelerations.empty() && numPositions == accelerations.size();

if (!hasVelocity && !hasAcceleration) {
// No velocity or acceleration, or incorrect sizes for both.
return 0;
}
const auto& t0 = xf.times[timeIndex];
auto shutter = param->GetShutterRange();
const auto numKeys = hasAcceleration ? deformKeys : std::min(2, deformKeys);
TfSmallVector<float, HD_ARNOLD_DEFAULT_PRIMVAR_SAMPLES> times;
times.resize(numKeys);
if (numKeys == 1) {
times[0] = 0.0;
} else {
times[0] = shutter[0];
for (auto i = decltype(numKeys){1}; i < numKeys - 1; i += 1) {
times[i] = AiLerp(static_cast<float>(i) / static_cast<float>(numKeys - 1), shutter[0], shutter[1]);
}
times[numKeys - 1] = shutter[1];
}
const auto fps = 1.0f / param->GetFPS();
const auto fps2 = fps * fps;
auto* array = AiArrayAllocate(numPositions, numKeys, AI_TYPE_VECTOR);
if (numPositions > 0 && numKeys > 0) {
auto* data = reinterpret_cast<GfVec3f*>(AiArrayMap(array));
for (auto pid = decltype(numPositions){0}; pid < numPositions; pid += 1) {
const auto p = positions[pid];
const auto v = hasVelocity ? velocities[pid] * fps : GfVec3f{0.0f};
const auto a = hasAcceleration ? accelerations[pid] * fps2 : GfVec3f{0.0f};
for (auto tid = decltype(numKeys){0}; tid < numKeys; tid += 1) {
const auto t = t0 + times[tid];
data[pid + tid * numPositions] = p + (v + a * t * 0.5f) * t;
}
}
AiArrayUnmap(array);
}
AiNodeSetArray(node, paramName, array);
return numKeys;
}

PXR_NAMESPACE_CLOSE_SCOPE
6 changes: 6 additions & 0 deletions libs/render_delegate/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,4 +475,10 @@ void HdArnoldGetPrimvars(
HDARNOLD_API
AtArray* HdArnoldGetShidxs(const HdGeomSubsets& subsets, int numFaces, HdArnoldSubsets& arnoldSubsets);


/// Use the velocities and accelerations primvars to extrapolate the positions.
///
///
size_t ExtrapolatePositions(AtNode* node, const AtString& paramName, HdArnoldSampledType<VtVec3fArray>& xf, const HdArnoldRenderParam* param, int deformKeys, const HdArnoldPrimvarMap* primvars);

PXR_NAMESPACE_CLOSE_SCOPE
Loading