[usdImaging][rmanpkg] Move usdRiPxrImaging to third_party/renderman/plugin

(Internal change: 2403858)

Author: tgvarik

pxr/usdImaging/CMakeLists.txt

@@ -2,7 +2,6 @@ set(DIRS
     usdImaging
     usdImagingGL
     usdProcImaging
-    usdRiPxrImaging
     usdSkelImaging
     usdVolImaging
     usdAppUtils

pxr/usdImaging/usdImaging/dataSourceMaterial.h

@@ -11,6 +11,7 @@
 
 #include "pxr/usd/usd/prim.h"
 
+#include "pxr/usdImaging/usdImaging/api.h"
 #include "pxr/usdImaging/usdImaging/dataSourcePrim.h"
 #include "pxr/usdImaging/usdImaging/dataSourceStageGlobals.h"
 
@@ -41,6 +42,7 @@ class UsdImagingDataSourceMaterial : public HdContainerDataSource
     /// treated as the terminal shader node in the graph rather than as a
     /// material (with relationships to the prims serving as terminal shader
     /// nodes). This is relevant for light and light filter cases.
+    USDIMAGING_API
     UsdImagingDataSourceMaterial(
         const UsdPrim &usdPrim,
         const UsdImagingDataSourceStageGlobals &stageGlobals,

pxr/usdImaging/usdImaging/version.h

@@ -18,7 +18,7 @@ PXR_NAMESPACE_OPEN_SCOPE
 // Version 5 -- GetPathForInstanceIndex returns absoluteInstanceIndex.
 // Version 6 -- PrimAdater::GetDependPaths.
 // Version 7 -- GetPathForInstanceIndex returns instanceContext.
-// Version 8 -- GetPathForInstanceIndex returns instanceContext (as 
+// Version 8 -- GetPathForInstanceIndex returns instanceContext (as
 //              SdfPathVector) and rprimPath  separately.
 // Version 9 -- Rework UsdImagingEngineGL::RenderParams API to conform to
 //              updated purpose tokens and make proxy imaging optional.
@@ -34,19 +34,20 @@ PXR_NAMESPACE_OPEN_SCOPE
 // Version 17 - RequestTrackVariability/RequestUpdateForTime, and UpdateForTime
 //              no longer automatically called.
 // Version 18 - Geom subsets accessed via UsdImagingDelegate::GetMeshTopology()
-//              will now have correctly prefixed index paths for id and 
+//              will now have correctly prefixed index paths for id and
 //              materialId.
 // Version 19 - UsdImagingPrimAdapter::InvalidateImagingSubprim takes
 //              invalidationType as argument.
 // Version 20 - Adding UsdImagingCreateSceneIndices.
-// Version 21 - Removes UsdImagingDirectMaterialBindingsSchema and 
+// Version 21 - Removes UsdImagingDirectMaterialBindingsSchema and
 //              UsdImagingCollectionMaterial BindingsSchema in favor of
-//              UsdImagingMaterialBindingsSchema and 
+//              UsdImagingMaterialBindingsSchema and
 //              UsdImagingMaterialBindingSchema.
 // Version 22 - Deprecates UsdImagingPrimAdapter::_GetShaderSourceTypes
 //              in favor of added UsdImagingPrimAdapter::_GetShadingSystems
+// Version 23 - UsdImagingDataSourceMaterial constructor gets USDIMAGING_API
 
-#define USD_IMAGING_API_VERSION 22
+#define USD_IMAGING_API_VERSION 23
 
 
 PXR_NAMESPACE_CLOSE_SCOPE

pxr/usdImaging/usdRiPxrImaging/version.h

@@ -5,6 +5,7 @@ add_subdirectory(hdPrmanLoader)
 add_subdirectory(hdPrmanXpuLoader)
 add_subdirectory(rtx_hioImage)
 add_subdirectory(usdRiPxr)
+add_subdirectory(usdRiPxrImaging)
 add_subdirectory(rmanUsdValidators)
 # Only build rmanOslParser when sdrOsl is disabled
 # This allows hdPrman to render OSL files without OSL pre-installed

third_party/renderman/plugin/CMakeLists.txt

@@ -80,7 +80,6 @@ pxr_plugin(${PXR_PACKAGE}
         hio
         TBB::tbb
         usdRi
-        usdRiPxrImaging
         usdVol
         usdVolImaging
         ${optionalLibs}
@@ -250,7 +249,6 @@ else()
             usd
             usdImaging
             usdRender
-            usdRiPxrImaging
             ${PXRCORE_LIBRARY}
             ${PRMAN_LIBRARY}
         CPPFILES

third_party/renderman/plugin/hdPrman/CMakeLists.txt

@@ -11,14 +11,16 @@
 #include "pxr/base/tf/stringUtils.h"
 #include "pxr/usd/sdf/path.h"
 
+#include <prmanapi.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 namespace HdPrmanDebugUtil {
 
 static const int cw = 3; // length of "─"
 static const char empty[] = "";
 static const char line[] = "────────────────────";
-static const char fmt[] = 
+static const char fmt[] =
              "%01$+*20$.*17$f  %02$+*21$.*17$f  %03$+*22$.*17$f │ %04$+*23$.*17$f\n"
     "%19$*18$s%05$+*20$.*17$f  %06$+*21$.*17$f  %07$+*22$.*17$f │ %08$+*23$.*17$f\n"
     "%19$*18$s%09$+*20$.*17$f  %10$+*21$.*17$f  %11$+*22$.*17$f │ %12$+*23$.*17$f\n"
@@ -40,8 +42,8 @@ MatrixToString(const GfMatrix4d& mat, const int indent, const int precision)
         mat[0][0], mat[1][0], mat[2][0], mat[3][0],
         mat[0][1], mat[1][1], mat[2][1], mat[3][1],
         mat[0][2], mat[1][2], mat[2][2], mat[3][2],
-        mat[0][3], mat[1][3], mat[2][3], mat[3][3], 
-        precision, indent, empty, 
+        mat[0][3], mat[1][3], mat[2][3], mat[3][3],
+        precision, indent, empty,
         width[0], width[1], width[2], width[3],
         cw * width[0], cw * width[1], cw * width[2], cw * width[3],
         line);
@@ -62,8 +64,8 @@ MatrixToString(const RtMatrix4x4& mat, const int indent, const int precision)
         mat.m[0][0], mat.m[1][0], mat.m[2][0], mat.m[3][0],
         mat.m[0][1], mat.m[1][1], mat.m[2][1], mat.m[3][1],
         mat.m[0][2], mat.m[1][2], mat.m[2][2], mat.m[3][2],
-        mat.m[0][3], mat.m[1][3], mat.m[2][3], mat.m[3][3], 
-        precision, indent, empty, 
+        mat.m[0][3], mat.m[1][3], mat.m[2][3], mat.m[3][3],
+        precision, indent, empty,
         width[0], width[1], width[2], width[3],
         cw * width[0], cw * width[1], cw * width[2], cw * width[3],
         line);
@@ -98,6 +100,9 @@ _GetParamPrefix(const RtParamList::ParamInfo& info)
         case RtDataType::k_samplefilter: out += "samplefilter"; break;
         case RtDataType::k_displayfilter: out += "displayfilter"; break;
         case RtDataType::k_struct: out += "struct"; break;
+#if _PRMANAPI_VERSION_MAJOR_ >= 27
+        case RtDataType::k_volumefilter: out += "volumefilter"; break;
+#endif
         default:
             TF_WARN("Unknown type %d", static_cast<int>(info.type));
     }
@@ -115,15 +120,15 @@ _GetParamPrefix(const RtParamList::ParamInfo& info)
     return out;
 }
 
-std::string 
+std::string
 _FormatParam(
     const RtParamList::ParamInfo& info,
     const RtParamList& _params,
     const int indent = 0) {
 
     static const char* Vec3Fmt = "(%f, %f, %f)";
     static const char* Vec4Fmt = "(%f, %f, %f, %f)";
-    
+
     const std::string prefix = _GetParamPrefix(info);
     const int fullIndent = indent + (int)prefix.size();
     RtParamList& params = const_cast<RtParamList&>(_params);
@@ -562,7 +567,7 @@ _FormatParam(
             }
             break;
         }
-        case RtDataType::k_struct: 
+        case RtDataType::k_struct:
         {
             if (info.detail == RtDetailType::k_reference) {
                 RtUString value;
@@ -572,6 +577,29 @@ _FormatParam(
             }
             break;
         }
+#if _PRMANAPI_VERSION_MAJOR_ >= 27
+        case RtDataType::k_volumefilter: {
+            if (info.array && info.detail == RtDetailType::k_reference) {
+                const RtUString* value = params.GetVolumeFilterReferenceArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "[";
+                    }
+                    val += TfStringPrintf("<%s>", (*(value+i)).CStr());
+                }
+                val += "]";
+            } else if (info.detail == RtDetailType::k_reference) {
+                RtUString value;
+                if (params.GetVolumeFilterReference(info.name, value)) {
+                    val = TfStringPrintf("<%s>", value.CStr());
+                }
+            }
+            break;
+        }
+#endif
         default:
         {
             TF_WARN("Unknown type %d", static_cast<int>(info.type));
@@ -596,7 +624,7 @@ RtParamListToString(const RtParamList& params, const int indent)
                 out += "\n";
             }
             out += TfStringPrintf(
-                "%*s%s", (pi == 0 ? 0 : indent), "", 
+                "%*s%s", (pi == 0 ? 0 : indent), "",
                 _FormatParam(info, params, indent).c_str());
         }
     }
@@ -615,7 +643,7 @@ GetCallerAsString(const TfCallContext& ctx)
     }
     if (i < 9) {
         const std::string& line = lines[i+1];
-        return line.substr(28, line.find_first_of("(") - 28) + " at " + 
+        return line.substr(28, line.find_first_of("(") - 28) + " at " +
             line.substr(line.find_last_of("/") + 1);
     }
     return "*** couldn't find caller ***";

third_party/renderman/plugin/hdPrman/debugUtil.cpp

@@ -40,9 +40,6 @@
 #include "pxr/usd/sdf/path.h"
 #include "pxr/usd/sdr/registry.h"
 
-#include "pxr/usdImaging/usdRiPxrImaging/tokens.h"
-#include "pxr/usdImaging/usdRiPxrImaging/version.h"
-
 #include "pxr/base/gf/vec3f.h"
 #include "pxr/base/gf/vec4f.h"
 #include "pxr/base/tf/diagnostic.h"
@@ -209,6 +206,7 @@ TF_DEFINE_PRIVATE_TOKENS(
     (__FnKat_bbox)
     (viewerMouseClick)
     ((houdiniInteractive, "houdini:interactive"))
+    (volumeFilter)
 );
 
 TF_DEFINE_PUBLIC_TOKENS(HdPrmanRenderSettingsTokens,
@@ -263,8 +261,8 @@ const TfTokenVector HdPrmanRenderDelegate::SUPPORTED_SPRIM_TYPES =
     HdPrimTypeTokens->diskLight,
     HdPrimTypeTokens->cylinderLight,
     HdPrimTypeTokens->sphereLight,
-#if USD_RI_PXR_IMAGING_API_VERSION >= 3 && _PRMANAPI_VERSION_MAJOR_ >= 27
-    UsdRiPxrImagingPrimTypeTokens->volumeFilter,
+#if _PRMANAPI_VERSION_MAJOR_ >= 27
+    _tokens->volumeFilter,
 #endif
 #if PXR_VERSION <= 2211
     HdPrmanTokens->meshLight,
@@ -568,8 +566,8 @@ HdPrmanRenderDelegate::CreateSprim(TfToken const& typeId,
         sprim = new HdPrmanMaterial(sprimId);
     } else if (typeId == HdPrimTypeTokens->coordSys) {
         sprim = new HdPrmanCoordSys(sprimId);
-#if USD_RI_PXR_IMAGING_API_VERSION >= 3
-    } else if (typeId == UsdRiPxrImagingPrimTypeTokens->volumeFilter) {
+#if _PRMANAPI_VERSION_MAJOR_ >= 27
+    } else if (typeId == _tokens->volumeFilter) {
         sprim = new HdPrman_VolumeFilter(sprimId);
 #endif
     } else if (typeId == HdPrimTypeTokens->lightFilter) {
@@ -630,8 +628,8 @@ HdPrmanRenderDelegate::CreateFallbackSprim(TfToken const& typeId)
         return new HdPrmanCoordSys(SdfPath::EmptyPath());
     } else if (typeId == HdPrimTypeTokens->lightFilter) {
         return new HdPrmanLightFilter(SdfPath::EmptyPath(), typeId);
-#if USD_RI_PXR_IMAGING_API_VERSION >= 3
-    } else if (typeId == UsdRiPxrImagingPrimTypeTokens->volumeFilter) {
+#if _PRMANAPI_VERSION_MAJOR_ >= 27
+    } else if (typeId == _tokens->volumeFilter) {
         return new HdPrman_VolumeFilter(SdfPath::EmptyPath());
 #endif
     } else if (typeId == HdPrimTypeTokens->light ||

third_party/renderman/plugin/hdPrman/renderDelegate.cpp

@@ -13,8 +13,6 @@
 
 #include "pxr/imaging/hd/version.h"
 
-#include "pxr/usdImaging/usdRiPxrImaging/tokens.h"
-#include "pxr/usdImaging/usdRiPxrImaging/version.h"
 #include "pxr/usdImaging/usdVolImaging/tokens.h"
 
 #include "pxr/usd/sdf/types.h"
@@ -135,11 +133,7 @@ _PopulateVolumeFilterNodes(
 
         // Look up volume filter ID
         if (HdSprim* sprim = sceneDelegate->GetRenderIndex().GetSprim(
-#if USD_RI_PXR_IMAGING_API_VERSION >= 3
-                UsdRiPxrImagingPrimTypeTokens->volumeFilter, filterPath)) {
-#else
                 _tokens->volumeFilter, filterPath)) {
-#endif
             if (auto* volumeFilter = dynamic_cast<HdPrman_VolumeFilter*>(sprim)) {
                 volumeFilter->SyncToRiley(sceneDelegate, param, riley);
                 coordsysIds->push_back(volumeFilter->GetCoordSysId());

third_party/renderman/plugin/hdPrman/volume.cpp

@@ -1,4 +1,4 @@
-set(PXR_PREFIX pxr/usdImaging)
+set(PXR_PREFIX pxr/imaging)
 set(PXR_PACKAGE usdRiPxrImaging)
 
 pxr_library(usdRiPxrImaging
@@ -29,7 +29,9 @@ pxr_library(usdRiPxrImaging
         pxrCameraProjectionAPIAdapter
         pxrDisplayFilterAdapter
         pxrIntegratorAdapter
+        pxrVolumeAPIAdapter
         pxrSampleFilterAdapter
+        pxrVolumeFilterPluginBaseAdapter
         tokens
 
     PRIVATE_CLASSES
@@ -46,3 +48,10 @@ pxr_library(usdRiPxrImaging
         plugInfo.json
 )
 
+if(TARGET usdRiPxrImaging)
+    target_include_directories(${PXR_PACKAGE}
+        PRIVATE
+            "${PROJECT_BINARY_DIR}/include/pxr/imaging"
+    )
+endif()
+