Skip to content

Commit

Permalink
Fix for dll import export mismatch
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Aye committed Sep 14, 2023
1 parent 6988a51 commit f8b0be4
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 33 deletions.
2 changes: 1 addition & 1 deletion pxr/base/tf/wrapTestPyStaticTokens.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ PXR_NAMESPACE_OPEN_SCOPE
((pear, "d'Anjou")) \
((apple, ( (Fuji) (Pippin) (McIntosh) )))

TF_DECLARE_PUBLIC_TOKENS(tfTestStaticTokens, TF_API, TF_TEST_TOKENS);
TF_DECLARE_PUBLIC_TOKENS(tfTestStaticTokens, TF_TEST_TOKENS);
TF_DEFINE_PUBLIC_TOKENS(tfTestStaticTokens, TF_TEST_TOKENS);

PXR_NAMESPACE_CLOSE_SCOPE
Expand Down
3 changes: 3 additions & 0 deletions pxr/imaging/hdGp/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ pxr_library(hdGp
PUBLIC_HEADERS
api.h

PUBLIC_HEADERS
api.h

RESOURCE_FILES
plugInfo.json
)
2 changes: 1 addition & 1 deletion pxr/imaging/hdGp/api.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2023 Pixar
// Copyright 2017 Pixar
//
// Licensed under the Apache License, Version 2.0 (the "Apache License")
// with the following modification; you may not use this file except in
Expand Down
2 changes: 1 addition & 1 deletion pxr/imaging/hdar/systemSchema.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class HdarSystemSchema : public HdSchema
/// Otherwise, this returns null.
///
/// This operation will be linear in the length of \p fromPath.
HD_API
HDAR_API
static HdContainerDataSourceHandle GetFromPath(
HdSceneIndexBaseRefPtr const &inputScene,
SdfPath const &fromPath,
Expand Down
19 changes: 10 additions & 9 deletions pxr/usdImaging/usdProcImaging/generativeProceduralAdapter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include "pxr/usdImaging/usdImaging/primAdapter.h"
#include "pxr/usd/usdProc/tokens.h"
#include "pxr/usdImaging/usdProcImaging/api.h"

PXR_NAMESPACE_OPEN_SCOPE

Expand All @@ -46,20 +47,20 @@ class UsdProcImagingGenerativeProceduralAdapter
/// \name Scene Index Support
// ---------------------------------------------------------------------- //

USDIMAGING_API
USDPROCIMAGING_API
TfTokenVector GetImagingSubprims(UsdPrim const& prim) override;

USDIMAGING_API
USDPROCIMAGING_API
TfToken GetImagingSubprimType(UsdPrim const& prim, TfToken const& subprim)
override;

USDIMAGING_API
USDPROCIMAGING_API
HdContainerDataSourceHandle GetImagingSubprimData(
UsdPrim const& prim,
TfToken const& subprim,
const UsdImagingDataSourceStageGlobals &stageGlobals) override;

USDIMAGING_API
USDPROCIMAGING_API
HdDataSourceLocatorSet InvalidateImagingSubprim(
UsdPrim const& prim,
TfToken const& subprim,
Expand Down Expand Up @@ -99,23 +100,23 @@ class UsdProcImagingGenerativeProceduralAdapter
TfToken const& propertyName) override;


USDIMAGING_API
USDPROCIMAGING_API
virtual void MarkDirty(UsdPrim const& prim,
SdfPath const& cachePath,
HdDirtyBits dirty,
UsdImagingIndexProxy* index) override;

USDIMAGING_API
USDPROCIMAGING_API
virtual void MarkTransformDirty(UsdPrim const& prim,
SdfPath const& cachePath,
UsdImagingIndexProxy* index) override;

USDIMAGING_API
USDPROCIMAGING_API
virtual void MarkVisibilityDirty(UsdPrim const& prim,
SdfPath const& cachePath,
UsdImagingIndexProxy* index) override;

USDIMAGING_API
USDPROCIMAGING_API
void TrackVariability(UsdPrim const& prim,
SdfPath const& cachePath,
HdDirtyBits* timeVaryingBits,
Expand All @@ -124,7 +125,7 @@ class UsdProcImagingGenerativeProceduralAdapter

protected:

USDIMAGING_API
USDPROCIMAGING_API
virtual void _RemovePrim(SdfPath const& cachePath,
UsdImagingIndexProxy* index) override;

Expand Down
8 changes: 4 additions & 4 deletions pxr/usdImaging/usdRiPxrImaging/pxrDisplayFilterAdapter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,21 @@ class UsdRiPxrImagingDisplayFilterAdapter : public UsdImagingPrimAdapter
/// \name Scene Index Support
// ---------------------------------------------------------------------- //

USDIMAGING_API
USDRIIMAGING_API
TfTokenVector GetImagingSubprims(UsdPrim const& prim) override;

USDIMAGING_API
USDRIIMAGING_API
TfToken GetImagingSubprimType(
UsdPrim const& prim,
TfToken const& subprim) override;

USDIMAGING_API
USDRIIMAGING_API
HdContainerDataSourceHandle GetImagingSubprimData(
UsdPrim const& prim,
TfToken const& subprim,
const UsdImagingDataSourceStageGlobals &stageGlobals) override;

USDIMAGING_API
USDRIIMAGING_API
HdDataSourceLocatorSet InvalidateImagingSubprim(
UsdPrim const& prim,
TfToken const& subprim,
Expand Down
8 changes: 4 additions & 4 deletions pxr/usdImaging/usdRiPxrImaging/pxrIntegratorAdapter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,21 @@ class UsdRiPxrImagingIntegratorAdapter : public UsdImagingPrimAdapter
/// \name Scene Index Support
// ---------------------------------------------------------------------- //

USDIMAGING_API
USDRIIMAGING_API
TfTokenVector GetImagingSubprims(UsdPrim const& prim) override;

USDIMAGING_API
USDRIIMAGING_API
TfToken GetImagingSubprimType(
UsdPrim const& prim,
TfToken const& subprim) override;

USDIMAGING_API
USDRIIMAGING_API
HdContainerDataSourceHandle GetImagingSubprimData(
UsdPrim const& prim,
TfToken const& subprim,
const UsdImagingDataSourceStageGlobals &stageGlobals) override;

USDIMAGING_API
USDRIIMAGING_API
HdDataSourceLocatorSet InvalidateImagingSubprim(
UsdPrim const& prim,
TfToken const& subprim,
Expand Down
8 changes: 4 additions & 4 deletions pxr/usdImaging/usdRiPxrImaging/pxrSampleFilterAdapter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,21 @@ class UsdRiPxrImagingSampleFilterAdapter : public UsdImagingPrimAdapter
/// \name Scene Index Support
// ---------------------------------------------------------------------- //

USDIMAGING_API
USDRIIMAGING_API
TfTokenVector GetImagingSubprims(UsdPrim const& prim) override;

USDIMAGING_API
USDRIIMAGING_API
TfToken GetImagingSubprimType(
UsdPrim const& prim,
TfToken const& subprim) override;

USDIMAGING_API
USDRIIMAGING_API
HdContainerDataSourceHandle GetImagingSubprimData(
UsdPrim const& prim,
TfToken const& subprim,
const UsdImagingDataSourceStageGlobals &stageGlobals) override;

USDIMAGING_API
USDRIIMAGING_API
HdDataSourceLocatorSet InvalidateImagingSubprim(
UsdPrim const& prim,
TfToken const& subprim,
Expand Down
6 changes: 3 additions & 3 deletions pxr/usdImaging/usdSkelImaging/skeletonAdapter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ class UsdSkelImagingSkeletonAdapter : public UsdImagingPrimAdapter
HdInterpolation interpolation,
const UsdImagingInstancerContext* instancerContext) const override;

USDIMAGING_API
USDSKELIMAGING_API
VtValue
GetExtComputationInput(
UsdPrim const& prim,
Expand All @@ -232,7 +232,7 @@ class UsdSkelImagingSkeletonAdapter : public UsdImagingPrimAdapter
UsdTimeCode time,
const UsdImagingInstancerContext* instancerContext) const override;

USDIMAGING_API
USDSKELIMAGING_API
size_t
SampleExtComputationInput(
UsdPrim const& prim,
Expand All @@ -244,7 +244,7 @@ class UsdSkelImagingSkeletonAdapter : public UsdImagingPrimAdapter
float *sampleTimes,
VtValue *sampleValues) override;

USDIMAGING_API
USDSKELIMAGING_API
std::string
GetExtComputationKernel(
UsdPrim const& prim,
Expand Down
6 changes: 3 additions & 3 deletions pxr/usdImaging/usdVolImaging/field3dAssetAdapter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ class UsdImagingField3DAssetAdapter : public UsdImagingFieldAdapter {
/// \name Scene Index Support
// ---------------------------------------------------------------------- //

USDIMAGING_API
USDVOLIMAGING_API
TfTokenVector GetImagingSubprims(UsdPrim const& prim) override;

USDIMAGING_API
USDVOLIMAGING_API
TfToken GetImagingSubprimType(UsdPrim const& prim, TfToken const& subprim)
override;

USDIMAGING_API
USDVOLIMAGING_API
HdContainerDataSourceHandle GetImagingSubprimData(
UsdPrim const& prim,
TfToken const& subprim,
Expand Down
6 changes: 3 additions & 3 deletions pxr/usdImaging/usdVolImaging/openvdbAssetAdapter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ class UsdImagingOpenVDBAssetAdapter : public UsdImagingFieldAdapter {
/// \name Scene Index Support
// ---------------------------------------------------------------------- //

USDIMAGING_API
USDVOLIMAGING_API
TfTokenVector GetImagingSubprims(UsdPrim const& prim) override;

USDIMAGING_API
USDVOLIMAGING_API
TfToken GetImagingSubprimType(UsdPrim const& prim, TfToken const& subprim)
override;

USDIMAGING_API
USDVOLIMAGING_API
HdContainerDataSourceHandle GetImagingSubprimData(
UsdPrim const& prim,
TfToken const& subprim,
Expand Down

0 comments on commit f8b0be4

Please sign in to comment.