Skip to content

Commit cdf6005

Browse files
johnhaddonjohnhaddon
authored
Merge pull request #1319 from johnhaddon/removeRenderManDriver
Remove RenderMan display driver
2 parents 64a9680 + bf93d69 commit cdf6005

File tree

8 files changed

+0
-564
lines changed

8 files changed

+0
-564
lines changed

‎.github/workflows/main.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,6 @@ jobs:
154154
echo CORTEX_DEPENDENCIES_HASH=`python config/installDependencies.py --archiveURL ${{ matrix.dependenciesURL }} --dependenciesDir ${{ env.CORTEX_BUILD_NAME }} --outputFormat "{archiveDigest}"` >> $GITHUB_ENV
155155
shell: bash
156156

157-
- name: Install 3Delight
158-
run: |
159-
python ./.github/workflows/main/installDelight.py
160-
echo DELIGHT=$GITHUB_WORKSPACE/3delight >> $GITHUB_ENV
161-
shell: bash
162-
163157
- name: Cache
164158
uses: actions/cache@v3
165159
with:

‎.github/workflows/main/installDelight.py‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎.github/workflows/main/options.posix‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ build = "./" + os.environ.get( "CORTEX_BUILD_NAME" )
99

1010
INSTALL_PREFIX = build
1111
INSTALL_DOC_DIR = build + "/doc"
12-
INSTALL_RMANPROCEDURAL_NAME = build + "/build/renderMan/procedurals/iePython"
13-
INSTALL_RMANDISPLAY_NAME = build + "/renderMan/displayDrivers/ieDisplay"
1412
INSTALL_PYTHON_DIR = build + "/python"
1513
INSTALL_IECORE_OPS = ""
1614

@@ -64,7 +62,6 @@ USD_LIB_PREFIX = "usd_"
6462
# Renderers
6563
# =========
6664

67-
RMAN_ROOT = os.environ["DELIGHT"]
6865
APPLESEED_ROOT = deps + "/appleseed"
6966
APPLESEED_INCLUDE_PATH = deps + "/appleseed/include"
7067
APPLESEED_LIB_PATH = deps + "/appleseed/lib"

‎.github/workflows/main/options.windows‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ build = os.environ.get( "CORTEX_BUILD_NAME" )
88

99
INSTALL_PREFIX = build
1010
INSTALL_DOC_DIR = build + "\\doc"
11-
INSTALL_RMANPROCEDURAL_NAME = build + "\\build\\renderMan\\procedurals\\iePython"
12-
INSTALL_RMANDISPLAY_NAME = build + "\\renderMan\\displayDrivers\\ieDisplay"
1311
INSTALL_PYTHON_DIR = build + "\\python"
1412
INSTALL_IECORE_OPS = ""
1513

@@ -52,8 +50,6 @@ DOXYGEN = deps + "\\doxygen\\doxygen.exe"
5250
# Renderers
5351
# =========
5452

55-
RMAN_ROOT = os.environ["DELIGHT"]
56-
5753
APPLESEED_ROOT = deps + "\\appleseed"
5854
APPLESEED_INCLUDE_PATH = deps + "\\appleseed\\include"
5955
APPLESEED_LIB_PATH = deps + "\\appleseed\\lib"

‎SConstruct‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -339,14 +339,6 @@ o.Add(
339339
"",
340340
)
341341

342-
# Renderman options
343-
344-
o.Add(
345-
"RMAN_ROOT",
346-
"The directory in which your RenderMan renderer is installed.",
347-
"",
348-
)
349-
350342
# Nuke options
351343

352344
o.Add(
@@ -711,12 +703,6 @@ o.Add(
711703
"$INSTALL_PREFIX/glsl",
712704
)
713705

714-
o.Add(
715-
"INSTALL_RMANDISPLAY_NAME",
716-
"The name under which to install the renderman displays.",
717-
"$INSTALL_PREFIX/rmanDisplays/$IECORE_NAME",
718-
)
719-
720706
o.Add(
721707
"INSTALL_MEL_DIR",
722708
"The directory in which to install mel scripts.",
@@ -2133,43 +2119,6 @@ if doConfigure :
21332119
NoCache( vdbTest )
21342120
vdbTestEnv.Alias( "testVDB", vdbTest )
21352121

2136-
###########################################################################################
2137-
# Build and install the renderman display driver
2138-
###########################################################################################
2139-
2140-
if doConfigure :
2141-
2142-
riDisplayDriverEnv = env.Clone( IECORE_NAME = "ieDisplay", SHLIBPREFIX="" )
2143-
riDisplayDriverEnv.Append( CXXFLAGS = [ systemIncludeArgument, "$RMAN_ROOT/include" ] )
2144-
2145-
c = configureSharedLibrary( riDisplayDriverEnv )
2146-
if not c.CheckCXXHeader( "ndspy.h" ) :
2147-
2148-
sys.stderr.write( "WARNING : ndspy.h not found - check RMAN_ROOT.\n" )
2149-
c.Finish()
2150-
2151-
else :
2152-
2153-
c.Finish()
2154-
2155-
# we can't append this before configuring, as then it gets built as
2156-
# part of the configure process
2157-
riDisplayDriverEnv.Append(
2158-
LIBS = [
2159-
os.path.basename( coreEnv.subst( "$INSTALL_LIB_NAME" ) ),
2160-
os.path.basename( imageEnv.subst( "$INSTALL_LIB_NAME" ) ),
2161-
]
2162-
)
2163-
2164-
riDisplayDriver = riDisplayDriverEnv.SharedLibrary( "src/rmanDisplays/ieDisplay/" + os.path.basename( riDisplayDriverEnv.subst( "$INSTALL_RMANDISPLAY_NAME" ) ), "src/rmanDisplays/ieDisplay/IEDisplay.cpp" )
2165-
riDisplayDriverInstall = riDisplayDriverEnv.Install( os.path.dirname( riDisplayDriverEnv.subst( "$INSTALL_RMANDISPLAY_NAME" ) ), riDisplayDriver )
2166-
riDisplayDriverEnv.NoCache( riDisplayDriverInstall )
2167-
riDisplayDriverEnv.AddPostAction( riDisplayDriverInstall, lambda target, source, env : makeLibSymLinks( riDisplayDriverEnv, libNameVar="INSTALL_RMANDISPLAY_NAME" ) )
2168-
riDisplayDriverEnv.Alias( "install", riDisplayDriverInstall )
2169-
riDisplayDriverEnv.Alias( "installRI", riDisplayDriverInstall )
2170-
2171-
Default( [ riDisplayDriver ] )
2172-
21732122
###########################################################################################
21742123
# Build, install and test the optional CoreGL library and bindings
21752124
###########################################################################################

‎config/ie/options‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -252,20 +252,6 @@ if targetApp :
252252
else:
253253
appPrefix = os.path.join( installPrefix, targetApp, targetAppMajorVersion )
254254

255-
# find 3delight. we only build the 3delight stuff if the compiler we're building with is suitable.
256-
dlReg = None
257-
dlVersion = getOption( "DL_VERSION", os.environ.get( "DL_VERSION", None ) )
258-
try :
259-
dlReg = IEEnv.registry["apps"]["3delight"][dlVersion][platform]
260-
if dlReg["compiler"]==compiler :
261-
RMAN_ROOT = dlReg["location"]
262-
os.environ["DELIGHT_CONF"] = "/software/config/3delight"
263-
264-
# Add ribdepends location to path
265-
os.environ["PATH"] = os.path.join( RMAN_ROOT, "bin" ) + ":" + os.environ["PATH"]
266-
except :
267-
pass
268-
269255
appleseedReg = None
270256
appleseedVersion = getOption( "APPLESEED_VERSION", os.environ.get("APPLESEED_VERSION", "") )
271257
try :
@@ -482,8 +468,6 @@ testLibs = [
482468
os.path.join( pythonReg["location"], compiler, compilerVersion, "lib" ),
483469
os.path.join( compilerReg["location"], "lib" ),
484470
]
485-
if dlReg :
486-
testLibs.append( dlReg["location"] + "/lib" )
487471
if appleseedReg :
488472
testLibs.extend( [ APPLESEED_LIB_PATH, OSL_LIB_PATH, OIIO_LIB_PATH ] )
489473
TEST_LIBPATH = ":".join( testLibs )
@@ -500,29 +484,16 @@ if targetApp :
500484
INSTALL_LIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
501485
INSTALL_PYTHONLIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION-python$PYTHON_VERSION" )
502486
INSTALL_PYTHON_DIR = os.path.join( appPrefix, "python" )
503-
INSTALL_RMANLIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
504487
INSTALL_APPLESEEDLIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
505488
INSTALL_ALEMBICLIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
506489
INSTALL_USDLIB_NAME = os.path.join( appPrefix, "lib", "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
507-
# we don't want to build the renderman procedurals when we build apps, as otherwise they end
508-
# up causing linking conflicts at rendertime. this is because the procedural would be linking to the
509-
# boost version an app needs, whereas the other libraries are linking to the correct boost version for
510-
# 3delight, so we just install the procedurals into a temp directory where they can't do any harm.
511-
INSTALL_RMANPROCEDURAL_NAME = os.path.join( "tmp", os.environ['USER'], "unwantedRManProcedurals/$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
512-
INSTALL_RMANDISPLAY_NAME = os.path.join( "tmp", os.environ['USER'], "unwantedRManDisplays/$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
513490
INSTALL_APPLESEEDOUTPUTDRIVER_NAME = os.path.join( "tmp", os.environ['USER'], "unwantedAppleseedDrivers/$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
514491
else :
515492
INSTALL_HEADER_DIR = os.path.join( basePrefix, "include" )
516493
INSTALL_USD_RESOURCE_DIR = os.path.join( basePrefix, "resource" )
517494
INSTALL_LIB_NAME = os.path.join( basePrefix, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
518495
INSTALL_PYTHONLIB_NAME = os.path.join( basePrefix, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION-python$PYTHON_VERSION" )
519496
INSTALL_PYTHON_DIR = os.path.join( basePrefix, "python", pythonVersion, compiler, compilerVersion )
520-
# We use basePrefix for IECoreRI, but dlPrefix for the renderman procedurals. See the note in
521-
# the dlReg section for an explanation.
522-
INSTALL_RMANLIB_NAME = os.path.join( basePrefix, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
523-
if dlVersion:
524-
INSTALL_RMANPROCEDURAL_NAME = os.path.join( basePrefix, "3delight", dlVersion, "procedurals", "python", "$PYTHON_VERSION", compiler, compilerVersion, "$IECORE_NAME" )
525-
INSTALL_RMANDISPLAY_NAME = os.path.join( basePrefix, "3delight", dlVersion, "displayDrivers", compiler, compilerVersion, "$IECORE_NAME" )
526497
INSTALL_APPLESEEDLIB_NAME = os.path.join( basePrefix, "appleseed", appleseedVersion, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )
527498
INSTALL_APPLESEEDOUTPUTDRIVER_NAME = os.path.join( basePrefix, "appleseed", appleseedVersion, "plugins", compiler, compilerVersion, "$IECORE_NAME" )
528499
INSTALL_ALEMBICLIB_NAME = os.path.join( basePrefix, "lib", compiler, compilerVersion, "$IECORE_NAME-$IECORE_COMPATIBILITY_VERSION" )

‎config/installDependencies.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
os.path.join( "lib", "IECore*" ),
115115
os.path.join( "python", "IECore*" ),
116116
os.path.join( "resources", "IECore*" ),
117-
"renderMan",
118117
"procedurals",
119118
] :
120119
for f in glob.glob( os.path.join( args.dependenciesDir, pattern ) ) :

0 commit comments

Comments
 (0)