GPUOpen-LibrariesAndSDKs
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 11 additions & 0 deletions b/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 11 additions & 0 deletions
diff --git a/‎RadeonProImageProcessingSDK b/‎RadeonProImageProcessingSDK
diff --git a/‎RadeonProRenderSDK b/‎RadeonProRenderSDK
diff --git a/‎cmd_tools/create_sdk.py
Lines changed: 7 additions & 7 deletions b/‎cmd_tools/create_sdk.py
Lines changed: 7 additions & 7 deletions
diff --git a/‎src/bindings/pyrpr/pyrprwrap_make.py
Lines changed: 1 addition & 1 deletion b/‎src/bindings/pyrpr/pyrprwrap_make.py
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/bindings/pyrpr/rpr.py
Lines changed: 5 additions & 2 deletions b/‎src/bindings/pyrpr/rpr.py
Lines changed: 5 additions & 2 deletions
diff --git a/‎src/bindings/pyrpr/src/pyrpr.py
Lines changed: 14 additions & 3 deletions b/‎src/bindings/pyrpr/src/pyrpr.py
Lines changed: 14 additions & 3 deletions
diff --git a/‎src/bindings/pyrpr/src/pyrpr2.py
Lines changed: 47 additions & 17 deletions b/‎src/bindings/pyrpr/src/pyrpr2.py
Lines changed: 47 additions & 17 deletions
diff --git a/‎src/bindings/pyrpr/src/pyrpr_load_store.py
Lines changed: 2 additions & 5 deletions b/‎src/bindings/pyrpr/src/pyrpr_load_store.py
Lines changed: 2 additions & 5 deletions
diff --git a/‎src/bindings/pyrpr/src/pyrprimagefilters.py
Lines changed: 6 additions & 1 deletion b/‎src/bindings/pyrpr/src/pyrprimagefilters.py
Lines changed: 6 additions & 1 deletion
@@ -0,0 +1,11 @@
+### PURPOSE
+What this PR is made for.
+
+### EFFECT OF CHANGE
+Changes made to project from the user's point of view.
+
+### TECHNICAL STEPS
+Changes made to code.
+
+### NOTES FOR REVIEWERS
+Notes, if needed.
@@ -109,27 +109,27 @@ def copy_rif_sdk():
             shutil.copy(str(lib), str(sdk_lib_dir))
 
     elif OS == 'Linux':
-        shutil.copy(str(bin_dir / "libRadeonImageFilters.so.1.5.1"),
+        shutil.copy(str(bin_dir / "libRadeonImageFilters.so.1.5.4"),
                     str(sdk_bin_dir / "libRadeonImageFilters.so"))
-        shutil.copy(str(bin_dir / "libRadeonML-MIOpen.so.0.9.2"),
-                    str(sdk_bin_dir / "libRadeonML-MIOpen.so"))
+        shutil.copy(str(bin_dir / "libRadeonML_MIOpen.so.0.9.7"),
+                    str(sdk_bin_dir / "libRadeonML_MIOpen.so"))
         shutil.copy(str(bin_dir / "libOpenImageDenoise.so.0.9.0"),
                     str(sdk_bin_dir / "libOpenImageDenoise.so"))
         shutil.copy(str(bin_dir / "libMIOpen.so.2.0.1"),
                     str(sdk_bin_dir / "libMIOpen.so.2"))
 
     elif OS == 'Darwin':
-        shutil.copy(str(bin_dir / "libRadeonImageFilters.1.5.1.dylib"),
+        shutil.copy(str(bin_dir / "libRadeonImageFilters.1.5.4.dylib"),
                     str(sdk_bin_dir / "libRadeonImageFilters.dylib"))
         shutil.copy(str(bin_dir / "libOpenImageDenoise.0.9.0.dylib"),
                     str(sdk_bin_dir / "libOpenImageDenoise.dylib"))
-        shutil.copy(str(bin_dir / "libRadeonML-MPS.0.9.2.dylib"),
-                    str(sdk_bin_dir / "libRadeonML-MPS.dylib"))
+        shutil.copy(str(bin_dir / "libRadeonML_MPS.0.9.7.dylib"),
+                    str(sdk_bin_dir / "libRadeonML_MPS.dylib"))
 
         # adjusting id of RIF libs
         install_name_tool('-id', "@rpath/libRadeonImageFilters.dylib", sdk_bin_dir / "libRadeonImageFilters.dylib")
         install_name_tool('-id', "@rpath/libOpenImageDenoise.dylib", sdk_bin_dir / "libOpenImageDenoise.dylib")
-        install_name_tool('-id', "@rpath/libRadeonML-MPS.dylib", sdk_bin_dir / "libRadeonML-MPS.dylib")
+        install_name_tool('-id', "@rpath/libRadeonML_MPS.dylib", sdk_bin_dir / "libRadeonML_MPS.dylib")
 
     else:
         raise KeyError("Unsupported OS", OS)
 
@@ -105,7 +105,7 @@ def print_function_header(name, args_names, args_defaults, doc):
                                                       'rprObject', 'rprShape', 'rprCamera', 'rprMesh',
                                                       'rprMaterialSystem', 'rprMaterialNode',
                                                       'rprLight', 'rprPointLight', 'rprSpotLight',
-                                                      'rprDirectionalLight',
+                                                      'rprDirectionalLight', 'rprDiskLight', 'rprSphereLight',
                                                       'rprEnvironmentLight', 'rprSkyLight',
                                                       'rprPostEffect',
                                                       'rprIESLight',
 
@@ -116,8 +116,11 @@ def write_api(api_desc_fpath, f, abi_mode):
         print(name)
         # if a constant is actually a variable to another constant reference that
         if "RPR_" + c.value in api.constants.keys():
-          print('#define', name, pyrprapi.eval_constant(api.constants["RPR_" + c.value].value) if
-          abi_mode else '...' , file=f)
+            print('#define', name, pyrprapi.eval_constant(api.constants["RPR_" + c.value].value)
+                  if abi_mode else '...', file=f)
+        elif "RIF_" + c.value in api.constants.keys():
+            print('#define', name, pyrprapi.eval_constant(api.constants["RIF_" + c.value].value)
+                  if abi_mode else '...', file=f)
         else:
           print('#define', name, pyrprapi.eval_constant(c.value) if abi_mode else '...', file=f)
     for name, t in api.types.items():
 
@@ -301,8 +301,8 @@ def get_device(create_flag, info_flag):
         cls.gpu_devices = []
         for i in range(16):
             create_flag = getattr(pyrprwrap, 'CREATION_FLAGS_ENABLE_GPU%d' % i)
-            if platform.system() == 'Darwin':
-                create_flag = create_flag | CREATION_FLAGS_ENABLE_METAL
+            create_flag = create_flag if platform.system() != 'Darwin' \
+                               else (create_flag | CREATION_FLAGS_ENABLE_METAL)
             device = get_device(create_flag, getattr(pyrprwrap, 'CONTEXT_GPU%d_NAME' % i))
             if not device:
                 break
@@ -467,7 +467,6 @@ def clear(self):
         self.subdivision_camera = None
         self.objects = set()
 
-
     def set_camera(self, camera):
         self.camera = camera
         SceneSetCamera(self, self.camera)
@@ -488,6 +487,10 @@ def set_background_image(self, image):
         self.background_image = image
         SceneSetBackgroundImage(self, image)
 
+    def set_background_color(self, r, g, b):
+        self.set_background_image(
+            ImageData(self.context, np.full((2, 2, 4), (r, g, b, 1.0), dtype=np.float32)))
+
     def add_environment_override(self, core_id, light):
         self.environment_overrides[core_id] = light
         EnvironmentLightSetEnvironmentLightOverride(self.environment_light, core_id, light)
@@ -1262,6 +1265,10 @@ def __init__(self, context):
     def set_radiant_power(self, r, g, b):
         PointLightSetRadiantPower3f(self, r, g, b)
 
+    def set_radius(self, radius):
+        """ Supported in RPR 2.0 Sphere Light """
+        pass
+
 
 class SpotLight(Light):
     def __init__(self, context):
@@ -1274,6 +1281,10 @@ def set_radiant_power(self, r, g, b):
     def set_cone_shape(self, iangle, oangle):
         SpotLightSetConeShape(self, iangle, oangle)
 
+    def set_radius(self, radius):
+        """ Supported in RPR 2.0 Disk Light """
+        pass
+
 
 class DirectionalLight(Light):
     def __init__(self, context):
 
@@ -1,7 +1,16 @@
+import math
 import numpy as np
 
 import pyrpr
-
+from pyrprwrap import (
+    ContextCreateSphereLight,
+    SphereLightSetRadiantPower3f,
+    SphereLightSetRadius,
+    ContextCreateDiskLight,
+    DiskLightSetRadiantPower3f,
+    DiskLightSetRadius,
+    DiskLightSetAngle,
+)
 
 # will be used in other modules to check if RPR 2 is enabled
 enabled = False
@@ -11,26 +20,47 @@ class Context(pyrpr.Context):
     pass
 
 
-class Scene(pyrpr.Scene):
-    def attach(self, obj):
-        if isinstance(obj, pyrpr.Curve):
-            return
+class SphereLight(pyrpr.Light):
+    def __init__(self, context):
+        super().__init__(context)
+        ContextCreateSphereLight(self.context, self)
+
+        # keep target intensity and radius to adjust actual intensity when they are changed
+        self._radius_squared = 1
+
+    def set_radiant_power(self, r, g, b):
+        # Adjust intensity by current radius
+        SphereLightSetRadiantPower3f(self,
+                                     r / self._radius_squared,
+                                     g / self._radius_squared,
+                                     b / self._radius_squared)
 
-        super().attach(obj)
+    def set_radius(self, radius):
+        radius = max(radius, 0.01)
+        self._radius_squared = radius * radius
+        SphereLightSetRadius(self, radius)
 
 
-class Curve(pyrpr.Curve):
-    def __init__(self, context, control_points, points_radii, uvs):
-        pass
+class DiskLight(pyrpr.Light):
+    def __init__(self, context):
+        super().__init__(context)
+        ContextCreateDiskLight(self.context, self)
 
-    def delete(self):
-        pass
+        # keep target intensity and radius to adjust actual intensity when they are changed
+        self._radius_squared = 1
 
-    def set_material(self, material):
-        pass
+    def set_radiant_power(self, r, g, b):
+        # Adjust intensity by current radius
+        DiskLightSetRadiantPower3f(self,
+                                   r / self._radius_squared,
+                                   g / self._radius_squared,
+                                   b / self._radius_squared)
 
-    def set_transform(self, transform: np.array, transpose=True):
-        pass
+    def set_cone_shape(self, iangle, oangle):
+        # Use external angle oangle
+        DiskLightSetAngle(self, oangle)
 
-    def set_name(self, name):
-        self.name = name
+    def set_radius(self, radius):
+        radius = max(radius, 0.01)
+        self._radius_squared = radius * radius
+        DiskLightSetRadius(self, radius)
@@ -13,8 +13,8 @@
 # limitations under the License.
 #********************************************************************
 import platform
-import _cffi_backend
 from _pyrpr_load_store import ffi
+import pyrpr
 
 lib = None
 
@@ -28,16 +28,13 @@ def init(rpr_sdk_bin_path):
 
 
 def export(name, context, scene, flags):
-
-    file_name = bytes(name, encoding="latin1")
-
     # last param defines export bit flags.
     # image handling type flags:
     # RPRLOADSTORE_EXPORTFLAG_EXTERNALFILES (1 << 0) - image data will be stored to rprsb external file
     # RPRLOADSTORE_EXPORTFLAG_COMPRESS_IMAGE_LEVEL_1 (1 << 1) - image data will be lossless compressed during export
     # RPRLOADSTORE_EXPORTFLAG_COMPRESS_IMAGE_LEVEL_2 (1 << 2) - image data will be lossy compressed during export
     #  note: without any of above flags images will not be exported.
-    return lib.rprsExport(file_name, context._get_handle(), scene._get_handle(),
+    return lib.rprsExport(pyrpr.encode(name), context._get_handle(), scene._get_handle(),
                           0, ffi.NULL, ffi.NULL, 0, ffi.NULL, ffi.NULL, flags)
 
 
 
@@ -291,7 +291,9 @@ def set_parameter(self, name, value):
         if name in self.parameters and self.parameters[name] == value:
             return
 
-        if isinstance(value, (int, bool)):
+        if name == 'compute_type':
+            ImageFilterSetComputeType(self, value)
+        elif isinstance(value, (int, bool)):
             ImageFilterSetParameter1u(self, pyrpr.encode(name), int(value))
             self.parameters[name] = value
         elif isinstance(value, float):
@@ -346,6 +348,9 @@ def detach_image_filters(self):
     def execute(self):
         ContextExecuteCommandQueue(self.context, self, ffi.NULL, ffi.NULL, ffi.NULL)
 
+    def synchronize(self):
+        SyncronizeQueue(self)
+
     def delete(self):
         self.detach_image_filters()
         super().delete()