Skip to content

Commit 67c213b

Browse files
boberflyboberfly
committed
Merge branch 'cycles2.83'
2 parents 3da6cd0 + b8fb5ee commit 67c213b

File tree

25 files changed

+514
-466
lines changed

25 files changed

+514
-466
lines changed

‎CMakeLists.txt‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ set( OPENEXR_ROOT_DIR ${GAFFER_ROOT} CACHE INTERNAL "" )
2626
set( WITH_OPENCOLORIO ON CACHE INTERNAL "" )
2727
set( OCIO_PATH ${GAFFER_ROOT} CACHE INTERNAL "" )
2828
set( GLEW_ROOT_DIR ${GAFFER_ROOT} CACHE INTERNAL "" )
29-
#set( WITH_CYCLES_OPENVDB ON CACHE INTERNAL "" )
30-
#set( WITH_OPENVDB_BLOSC ON CACHE INTERNAL "" )
29+
set( WITH_OPENVDB ON CACHE INTERNAL "" )
3130
set( OPENVDB_ROOT_DIR ${GAFFER_ROOT} CACHE INTERNAL "" )
3231
set( TBB_INSTALL_DIR ${GAFFER_ROOT} CACHE INTERNAL "" )
3332
if (MSVC)
@@ -124,18 +123,12 @@ if( WITH_CYCLES_DEVICE_OPTIX )
124123
add_definitions( -DWITH_OPTIX=1 -DWITH_CYCLES_CUDA_BINARIES=1 )
125124
endif()
126125

127-
if( WITH_CYCLES_ADAPTIVE_SAMPLING )
128-
add_definitions( -DWITH_CYCLES_ADAPTIVE_SAMPLING=1 )
129-
endif()
130-
131126
if( WITH_CYCLES_TEXTURE_CACHE )
132127
add_definitions( -DWITH_CYCLES_TEXTURE_CACHE=1 )
133128
endif()
134129

135-
if( WITH_CYCLES_OPENVDB )
136-
find_package(OpenVDB REQUIRED)
137-
add_definitions( -DWITH_CYCLES_OPENVDB=1 -DWITH_OPENVDB=1 -DWITH_OPENVDB_BLOSC=1 )
138-
endif()
130+
find_package(OpenVDB REQUIRED)
131+
add_definitions( -DWITH_OPENVDB=1 -DWITH_OPENVDB_BLOSC=1 )
139132

140133
if( WITH_CYCLES_LIGHTGROUPS )
141134
add_definitions( -DWITH_CYCLES_LIGHTGROUPS=1 )

‎build.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
"--experimental",
142142
type = distutils.util.strtobool,
143143
default = False,
144-
help = "Enable experimental build. Currently compiles in adaptive sampling, OpenVDB, light groups and texture cache modes."
144+
help = "Enable experimental build. Currently compiles light groups and texture cache modes."
145145
)
146146

147147
args = parser.parse_args()
@@ -371,10 +371,7 @@ def releaseId() :
371371
" -D WITH_CYCLES_EMBREE=ON"
372372
" -D WITH_CYCLES_OPENSUBDIV=ON"
373373
" -D WITH_CYCLES_LOGGING=ON"
374-
" -D WITH_CYCLES_ADAPTIVE_SAMPLING={withExperimental}"
375374
" -D WITH_CYCLES_TEXTURE_CACHE={withExperimental}"
376-
" -D WITH_CYCLES_OPENVDB={withExperimental}"
377-
" -D WITH_OPENVDB_BLOSC={withExperimental}"
378375
" -D WITH_CYCLES_LIGHTGROUPS={withExperimental}"
379376
" ../..".format( gafferCyclesRoot=gafferCyclesDirName, gafferRoot=gafferDirName, withOptix=withOptix, withExperimental=str( int( formatVariables["experimental"] ) ), **formatVariables ),
380377

‎build_docker_optix.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env bash
22

3-
python build.py --version 0.18.1 --cyclesVersion 0.17.0 --optix 1 --docker 1 --experimental 0 --upload 0 $@
3+
python build.py --version 0.19.0 --cyclesVersion 0.19.0 --optix 1 --docker 1 --experimental 0 --upload 0 $@

‎cycles‎

‎dependencies/Embree/config.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
"downloads" : [
44

5-
"https://github.com/embree/embree/archive/v3.7.0.tar.gz"
5+
"https://github.com/embree/embree/archive/v3.8.0.tar.gz"
66

77
],
88

@@ -24,7 +24,9 @@
2424
" -D EMBREE_RAY_MASK=ON"
2525
" -D EMBREE_FILTER_FUNCTION=ON"
2626
" -D EMBREE_BACKFACE_CULLING=OFF"
27-
" -D EMBREE_TASKING_SYSTEM=INTERNAL"
27+
" -D EMBREE_TASKING_SYSTEM=TBB"
28+
" -D EMBREE_TBB_ROOT={gafferRoot}"
29+
" -D EMBREE_MAX_ISA=AVX2"
2830
" ..",
2931
"cd gafferBuild && cmake --build . --config {cmakeBuildType} --target install -- -j {jobs}",
3032

‎include/GafferCycles/IECoreCyclesPreview/CameraAlgo.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ namespace CameraAlgo
5151
{
5252

5353
/// Converts the specified IECoreScene::Camera into a ccl::Camera.
54-
IECORECYCLES_API ccl::Camera *convert( const IECoreScene::Camera *camera, const std::string &nodeName, const ccl::Scene *scene = nullptr );
54+
IECORECYCLES_API ccl::Camera *convert( const IECoreScene::Camera *camera, const std::string &nodeName, ccl::Scene *scene = nullptr );
5555

5656
} // namespace CameraAlgo
5757

‎include/GafferCycles/IECoreCyclesPreview/CurvesAlgo.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ namespace CurvesAlgo
5151
{
5252

5353
/// Converts the specified IECoreScene::CurvesPrimitive into a ccl::Object.
54-
IECORECYCLES_API ccl::Object *convert( const IECoreScene::CurvesPrimitive *mesh, const std::string &nodeName, const ccl::Scene *scene = nullptr );
54+
IECORECYCLES_API ccl::Object *convert( const IECoreScene::CurvesPrimitive *mesh, const std::string &nodeName, ccl::Scene *scene = nullptr );
5555
/// As above, but converting a moving object. If no motion converter
5656
/// is available, the first sample is converted instead.
57-
IECORECYCLES_API ccl::Object *convert( const std::vector<const IECoreScene::CurvesPrimitive *> &samples, const std::vector<float> &times, const int frameIdx, const std::string &nodeName, const ccl::Scene *scene = nullptr );
57+
IECORECYCLES_API ccl::Object *convert( const std::vector<const IECoreScene::CurvesPrimitive *> &samples, const std::vector<float> &times, const int frameIdx, const std::string &nodeName, ccl::Scene *scene = nullptr );
5858

5959
} // namespace CurvesAlgo
6060

‎include/GafferCycles/IECoreCyclesPreview/MeshAlgo.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ namespace MeshAlgo
5151
{
5252

5353
/// Converts the specified IECoreScene::MeshPrimitive into a ccl::Object.
54-
IECORECYCLES_API ccl::Object *convert( const IECoreScene::MeshPrimitive *mesh, const std::string &nodeName, const ccl::Scene *scene = nullptr );
54+
IECORECYCLES_API ccl::Object *convert( const IECoreScene::MeshPrimitive *mesh, const std::string &nodeName, ccl::Scene *scene = nullptr );
5555
/// As above, but converting a moving object. If no motion converter
5656
/// is available, the first sample is converted instead.
57-
IECORECYCLES_API ccl::Object *convert( const std::vector<const IECoreScene::MeshPrimitive *> &samples, const std::vector<float> &times, const int frameIdx, const std::string &nodeName, const ccl::Scene *scene = nullptr );
57+
IECORECYCLES_API ccl::Object *convert( const std::vector<const IECoreScene::MeshPrimitive *> &samples, const std::vector<float> &times, const int frameIdx, const std::string &nodeName, ccl::Scene *scene = nullptr );
5858
/// Compute tangents.
5959
IECORECYCLES_API void computeTangents( ccl::Mesh *cmesh, const IECoreScene::MeshPrimitive *mesh, bool needsign );
6060

‎include/GafferCycles/IECoreCyclesPreview/ObjectAlgo.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@ namespace ObjectAlgo
5757
/// Cycles' internal Node/Socket API to form connections or apply parameters.
5858

5959
/// Converts the specified IECore::Object into a ccl::Object.
60-
IECORECYCLES_API ccl::Object *convert( const IECore::Object *object, const std::string &nodeName, const ccl::Scene *scene = nullptr );
60+
IECORECYCLES_API ccl::Object *convert( const IECore::Object *object, const std::string &nodeName, ccl::Scene *scene = nullptr );
6161
/// As above, but converting a moving object. If no motion converter
6262
/// is available, the first sample is converted instead.
63-
IECORECYCLES_API ccl::Object *convert( const std::vector<const IECore::Object *> &samples, const std::vector<float> &times, const int frame, const std::string &nodeName, const ccl::Scene *scene = nullptr );
63+
IECORECYCLES_API ccl::Object *convert( const std::vector<const IECore::Object *> &samples, const std::vector<float> &times, const int frame, const std::string &nodeName, ccl::Scene *scene = nullptr );
6464

6565
/// Signature of a function which can convert into a Cycles Object.
66-
typedef ccl::Object * (*Converter)( const IECore::Object *, const std::string &nodeName, const ccl::Scene *scene );
66+
typedef ccl::Object * (*Converter)( const IECore::Object *, const std::string &nodeName, ccl::Scene *scene );
6767
/// Signature of a function which can convert a series of IECore::Object
6868
/// samples into a moving Cycles object.
69-
typedef ccl::Object * (*MotionConverter)( const std::vector<const IECore::Object *> &samples, const std::vector<float> &times, const int frameIdx, const std::string &nodeName, const ccl::Scene *scene );
69+
typedef ccl::Object * (*MotionConverter)( const std::vector<const IECore::Object *> &samples, const std::vector<float> &times, const int frameIdx, const std::string &nodeName, ccl::Scene *scene );
7070

7171
/// Registers a converter for a specific type.
7272
/// Use the ConverterDescription utility class in preference to
@@ -82,8 +82,8 @@ class ConverterDescription
8282
public :
8383

8484
/// Type-specific conversion functions.
85-
typedef ccl::Object *(*Converter)( const T *, const std::string&, const ccl::Scene* );
86-
typedef ccl::Object *(*MotionConverter)( const std::vector<const T *> &, const std::vector<float> &, const int, const std::string&, const ccl::Scene* );
85+
typedef ccl::Object *(*Converter)( const T *, const std::string&, ccl::Scene* );
86+
typedef ccl::Object *(*MotionConverter)( const std::vector<const T *> &, const std::vector<float> &, const int, const std::string&, ccl::Scene* );
8787

8888
ConverterDescription( Converter converter, MotionConverter motionConverter = nullptr )
8989
{

‎include/GafferCycles/IECoreCyclesPreview/ShaderNetworkAlgo.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ namespace ShaderNetworkAlgo
5656
IECORECYCLES_API ccl::ShaderInput *input( ccl::ShaderNode *node, IECore::InternedString name );
5757
IECORECYCLES_API ccl::ShaderOutput *output( ccl::ShaderNode *node, IECore::InternedString name );
5858

59-
IECORECYCLES_API ccl::Shader *convert( const IECoreScene::ShaderNetwork *shaderNetwork, const ccl::ShaderManager *shaderManager, const std::string &namePrefix = "" );
59+
IECORECYCLES_API ccl::Shader *convert( const IECoreScene::ShaderNetwork *shaderNetwork, ccl::ShaderManager *shaderManager, const std::string &namePrefix = "" );
6060
IECORECYCLES_API ccl::Light *convert( const IECoreScene::ShaderNetwork *shaderNetwork );
61-
IECORECYCLES_API ccl::Shader *convertAOV( const IECoreScene::ShaderNetwork *shaderNetwork, ccl::Shader *cshader, const ccl::ShaderManager *shaderManager, const std::string &namePrefix = "" );
61+
IECORECYCLES_API ccl::Shader *convertAOV( const IECoreScene::ShaderNetwork *shaderNetwork, ccl::Shader *cshader, ccl::ShaderManager *shaderManager, const std::string &namePrefix = "" );
6262
IECORECYCLES_API ccl::Shader *setSingleSided( ccl::Shader *cshader );
6363
IECORECYCLES_API ccl::Shader *createDefaultShader();
6464

0 commit comments

Comments
 (0)