[hdSt] Indexed faceVarying and element primvar native support

Author: DDoS

pxr/imaging/hd/drawingCoord.h

@@ -62,6 +62,10 @@ PXR_NAMESPACE_OPEN_SCOPE
 /// instance level=0 ---> [ k ]
 /// instance level=1 ---> [k+1]
 /// instance level=2 ---> [k+2]
+///                        ...
+/// indexed primvar=0 --> [ x ]
+/// indexed primvar=1 --> [x+1]
+/// indexed primvar=2 --> [x+2]
 ///
 class HdDrawingCoord {
 public:
@@ -73,13 +77,16 @@ class HdDrawingCoord {
         // default slots:
         _topology(2),
         _instancePrimvar(Unassigned),
+        _indexedPrimvar(Unassigned),
+        _indexedPrimvarCount(0),
         _constantPrimvar(0),
         _vertexPrimvar(1),
         _elementPrimvar(3),
         _instanceIndex(4),
         _faceVaryingPrimvar(5),
         _topologyVisibility(6),
-        _varyingPrimvar(7) {
+        _varyingPrimvar(7)
+    {
     }
 
     int GetConstantPrimvarIndex() const    { return _constantPrimvar; }
@@ -106,9 +113,31 @@ class HdDrawingCoord {
         return _instancePrimvar + level;
     }
 
+    // indexed primvars take up a range of slots.
+    void SetIndexedPrimvarSlotRange(int base, int count) {
+        _indexedPrimvar = base;
+        _indexedPrimvarCount = count;
+    }
+
+    int GetIndexedPrimvarCount() const {
+        return _indexedPrimvarCount;
+    }
+
+    int GetIndexedPrimvarIndex(int channel) const {
+        TF_VERIFY(_indexedPrimvar != Unassigned);
+        TF_VERIFY(channel < _indexedPrimvarCount);
+        return _indexedPrimvar + channel;
+    }
+
+    int GetTotalDrawCoordCount() const {
+        return _indexedPrimvar + _indexedPrimvarCount;
+    }
+
 private:
     int16_t _topology;
     int16_t _instancePrimvar;
+    int16_t _indexedPrimvar;
+    int8_t _indexedPrimvarCount;
     int8_t _constantPrimvar;
     int8_t _vertexPrimvar;
     int8_t _elementPrimvar;

pxr/imaging/hd/meshUtil.cpp

@@ -341,6 +341,10 @@ HdMeshUtil::ComputeTriangulatedFaceVaryingPrimvar(void const* source,
     bool flip = (_topology->GetOrientation() != HdTokens->rightHanded);
 
     switch (dataType) {
+    case HdTypeInt32:
+        _TriangulateFaceVarying<int32_t>(_id, faceVertexCounts, holeFaces, flip,
+                source, numElements, triangulated);
+        break;
     case HdTypeFloat:
         return _TriangulateFaceVarying<float>(_id, faceVertexCounts, holeFaces, flip,
                 source, numElements, triangulated);

pxr/imaging/hd/tokens.h

@@ -44,6 +44,7 @@ PXR_NAMESPACE_OPEN_SCOPE
     (drawingCoord1)                             \
     (drawingCoord2)                             \
     (drawingCoordI)                             \
+    (drawingCoordX)                             \
     (drivers)                                   \
     (edgeIndices)                               \
     (elementCount)                              \

pxr/imaging/hdSt/CMakeLists.txt

@@ -523,6 +523,16 @@ pxr_build_test(testHdStPrimvars
     CPPFILES
         testenv/testHdStPrimvars.cpp
 )
+pxr_build_test(testHdStIndexedPrimvars
+    LIBRARIES
+        hdSt
+        hd
+        vt
+        tf
+        gf
+    CPPFILES
+        testenv/testHdStIndexedPrimvars.cpp
+)
 pxr_build_test(testHdStQuadrangulation
     LIBRARIES
         hdSt
@@ -744,6 +754,10 @@ pxr_install_test_dir(
     SRC testenv/testHdStPrimvars
     DEST testHdStPrimvars
 )
+pxr_install_test_dir(
+    SRC testenv/testHdStIndexedPrimvars
+    DEST testHdStIndexedPrimvars
+)
 pxr_install_test_dir(
     SRC testenv/testHdStSamplerObjectRegistry
     DEST testHdStSamplerObjectRegistry
@@ -3008,6 +3022,21 @@ pxr_register_test(testHdStPrimvars
         HDST_ENABLE_MATERIAL_PRIMVAR_FILTERING=0
         TF_DEBUG=HD_SAFE_MODE
 )
+pxr_register_test(testHdStIndexedPrimvars
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStIndexedPrimvars --offscreen"
+    EXPECTED_RETURN_CODE 0
+    IMAGE_DIFF_COMPARE
+        testHdStIndexedPrimvars_before.png
+        testHdStIndexedPrimvars_replaceColor.png
+        testHdStIndexedPrimvars_replaceOpacity.png
+        testHdStIndexedPrimvars_partialDirty.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    TESTENV testHdStIndexedPrimvars
+    ENV
+        TF_DEBUG=HD_SAFE_MODE
+)
 pxr_register_test(testHdStQuadrangulation
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStQuadrangulation"
     EXPECTED_RETURN_CODE 0