Skip to content

Commit 9f6ce20

Browse files
authored
Merge pull request #426 from GPUOpen-LibrariesAndSDKs/Release_December_2021
Release december 2021
2 parents 04b105f + 2e9609f commit 9f6ce20

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+858
-123
lines changed

BlenderPkg/build_osx-arm64.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#**********************************************************************
2+
# Copyright 2020 Advanced Micro Devices, Inc
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
#********************************************************************
15+
16+
pushd ..
17+
./build_osx-arm64.sh
18+
popd
19+
20+
arch -arm64 python3.9 create_zip_addon.py

Changelog.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
# Version 3.3.16
2+
## New Features:
3+
- Support for Blender 3.0 has been added.
4+
- Updates to the Render Quality modes:
5+
- RPR Interactive is a new mode supporting GPUs that use the Vulkan ray tracing extension, and is optimized for fast viewport rendering;
6+
- RPR Final, previously “Full” mode. It is intended for final rendering with the utmost physical correctness and image quality;
7+
- Both modes produce similar images;
8+
- Both modes support full MaterialX shader networks.
9+
- Support for ARM-based Apple Macs has been added.
10+
- The ability to override the color of an object’s shadow has been added (in the visibility settings).
11+
12+
## Bugs Fixed:
13+
- Blender objects using the “Fluid Modifier” were not rendering correctly — fixed.
14+
- Outline rendering can now use UV mapping to generate the outline.
15+
- Noise Threshold was previously locked in the viewport settings — fixed.
16+
- The “Key Error 41” issue when exporting a .rpr file has been fixed.
17+
- Incorrect Subsurface Scattering on Vega GPUS has been fixed.
18+
- Black rendering of toon shaders on macOS has been fixed.
19+
- A crash that could occur when processing emission shaders objects with subdivision added has been eliminated.
20+
- The startup time for CPU rendering has been reduced.
21+
- Low utilization on macOS with CPU + GPU rendering has been eliminated.
22+
- Performance in scenes with many transparent materials has been improved.
23+
- An issue with artifacts in alpha texture masks has been fixed.
24+
- The render performance on Vega and Polaris GPUs has been improved.
25+
- Particle motion blur on GPUs now works correctly.
26+
- A bug in the “Monster Under the Bed” scene has been fixed.
27+
- A crash that could occur when using .tif textures with zip compression has been eliminated.
28+
- An issue with emission shaders disappearing in volume objects has been fixed.
29+
30+
131
# Version 3.3
232
## New Features:
333
- Support for Fog and Heterogenous Volume rendering has been added to the RPR Full mode. Simulated volumes are now rendered on CPU and GPU.

RPRBlenderHelper/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@ target_link_libraries(RPRBlenderHelper ${LIBS})
5353

5454

5555
# Building RPRBlenderHelper with OPENVDB support
56+
57+
if("${UNIX}" OR ("${APPLE}" AND ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "arm64"))
58+
# for Linux and Mac with arm64 openvdb isn't supported yet
59+
return()
60+
endif()
61+
5662
set(OPENVDB_SDK_PATH ${SHARED_DIR}/OpenVdb)
5763

5864
list(APPEND SOURCES
@@ -79,9 +85,6 @@ elseif(${APPLE})
7985
${OPENVDB_SDK_PATH}/OSX/lib/libtbb.a
8086
)
8187

82-
else()
83-
return()
84-
8588
endif()
8689

8790
add_library(RPRBlenderHelper_vdb SHARED ${SOURCES})

RadeonProImageProcessingSDK

RadeonProRenderSDK

Submodule RadeonProRenderSDK updated 169 files

build.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import sys
1919
import os
20+
import shutil
2021
import platform
2122
import subprocess
2223
from pathlib import Path
@@ -40,10 +41,11 @@
4041
subprocess.check_call([sys.executable, 'rpr_load_store.py'])
4142
os.chdir(cwd)
4243

43-
if sys.version_info.major == 3 and sys.version_info.minor == 7:
44-
# we are going to build RPRBlenderHelper only for python 3.7
44+
if sys.version_info.major == 3 and sys.version_info.minor == 9:
45+
# we are going to build RPRBlenderHelper only for python 3.9
4546
os.chdir('RPRBlenderHelper')
46-
os.makedirs('.build', exist_ok=True)
47+
shutil.rmtree('.build', ignore_errors=True)
48+
os.makedirs('.build')
4749
os.chdir('.build')
4850
if 'Windows' == platform.system():
4951
subprocess.check_call(['cmake', '-G', 'Visual Studio 14 2015 Win64', '..'])

build_osx-arm64.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
3+
arch -arm64 python3.9 cmd_tools/create_sdk.py
4+
5+
IGNORE_MISSING_OPENMP=1
6+
cxml="/usr/local/bin/castxml"
7+
if [ -f "$cxml" ]; then
8+
arch -arm64 python3.9 src/bindings/pyrpr/src/pyrprapi.py $cxml
9+
if [ -f "./bindings-ok" ]; then
10+
arch -arm64 python3.9 build.py
11+
else
12+
echo Compiling bindings failed
13+
fi
14+
else
15+
echo Error : $cxml is required for build
16+
fi
17+
18+

build_osx.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
#!/bin/bash
22

3-
PYTHON_VERSION=`python3.7 --version`
4-
5-
if [[ $PYTHON_VERSION =~ 'Python 3.7.' ]]; then
6-
echo Found correct python version
7-
else
8-
echo Incorrect version of python in path: $PYTHON_VERSION
9-
exit 1
10-
fi
11-
12-
python3.7 cmd_tools/create_sdk.py
3+
python3.9 cmd_tools/create_sdk.py
134

145
IGNORE_MISSING_OPENMP=1
156
cxml="/usr/local/bin/castxml"
@@ -18,7 +9,6 @@ if [ -f "$cxml" ]; then
189
if [ -f "./bindings-ok" ]; then
1910
python3.7 build.py
2011
python3.9 build.py
21-
#sh osx/postbuild.sh
2212
else
2313
echo Compiling bindings failed
2414
fi

cmd_tools/create_sdk.py

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020

2121
OS = platform.system()
22+
PROC = platform.uname().machine
2223
sdk_dir = Path(".sdk")
2324

2425

@@ -87,11 +88,15 @@ def copy_rif_sdk():
8788
shutil.copytree(str(rif_dir / "models"), str(sdk_rif_dir / "models"))
8889

8990
# getting rif bin_dir
90-
os_str = {
91-
'Windows': "Windows",
92-
'Linux': "Ubuntu20",
93-
'Darwin': "OSX"
94-
}[OS]
91+
if OS == 'Windows':
92+
os_str = "Windows"
93+
elif OS == 'Linux':
94+
os_str = "Ubuntu20"
95+
else: # Darwin
96+
if PROC == 'x86_64':
97+
os_str = "OSX"
98+
else:
99+
os_str = "MacOS_ARM"
95100
bin_dir = rif_dir / os_str / "Dynamic"
96101

97102
# copying inc files
@@ -127,16 +132,18 @@ def copy_rif_sdk():
127132
elif OS == 'Darwin':
128133
shutil.copy(str(find_file(bin_dir, "libRadeonImageFilters*.dylib")),
129134
str(sdk_bin_dir / "libRadeonImageFilters.dylib"))
130-
shutil.copy(str(find_file(bin_dir, "libOpenImageDenoise*.dylib")),
131-
str(sdk_bin_dir / "libOpenImageDenoise.dylib"))
135+
if PROC == 'x86_64':
136+
shutil.copy(str(find_file(bin_dir, "libOpenImageDenoise*.dylib")),
137+
str(sdk_bin_dir / "libOpenImageDenoise.dylib"))
132138
shutil.copy(str(find_file(bin_dir, "libRadeonML_MPS*.dylib")),
133139
str(sdk_bin_dir / "libRadeonML_MPS.dylib"))
134140
shutil.copy(str(find_file(bin_dir, "libRadeonML.0*.dylib")),
135141
str(sdk_bin_dir / "libRadeonML.0.dylib"))
136142

137143
# adjusting id of RIF libs
138144
install_name_tool('-id', "@rpath/libRadeonImageFilters.dylib", sdk_bin_dir / "libRadeonImageFilters.dylib")
139-
install_name_tool('-id', "@rpath/libOpenImageDenoise.dylib", sdk_bin_dir / "libOpenImageDenoise.dylib")
145+
if PROC == 'x86_64':
146+
install_name_tool('-id', "@rpath/libOpenImageDenoise.dylib", sdk_bin_dir / "libOpenImageDenoise.dylib")
140147
install_name_tool('-id', "@rpath/libRadeonML_MPS.dylib", sdk_bin_dir / "libRadeonML_MPS.dylib")
141148
install_name_tool('-id', "@rpath/libRadeonML.0.dylib", sdk_bin_dir / "libRadeonML.0.dylib")
142149

src/RPRBlender.pyproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
<Compile Include="rprblender\nodes\sockets.py" />
8282
<Compile Include="rprblender\nodes\__init__.py" />
8383
<Compile Include="rprblender\operators\export_scene.py" />
84+
<Compile Include="rprblender\operators\export_training_data.py" />
8485
<Compile Include="rprblender\operators\light.py" />
8586
<Compile Include="rprblender\operators\material_library.py" />
8687
<Compile Include="rprblender\operators\nodes.py" />

0 commit comments

Comments
 (0)