Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions lib/common/grid_util/PackTiles.cc
Original file line number Diff line number Diff line change
Expand Up @@ -608,10 +608,11 @@ class PackTilesImpl

inline static unsigned short ftoh(const float f)
{
#if defined(__ARM_NEON__) // TODO: Verify this
__fp16 output;
vst1_f16(&output, vcvt_f16_f32(vld1q_f32(&f)));
return output;
#if defined(__ARM_NEON__)
__fp16 h = static_cast<__fp16>(f);
unsigned short output;
std::memcpy(static_cast<void *>(&output), static_cast<const void *>(&h), sizeof(output));
return output;
#else
return _cvtss_sh(f, 0); // Convert full 32bit float to half 16bit float
// An immediate value controlling rounding using bits : 0=Nearest
Expand All @@ -620,10 +621,10 @@ class PackTilesImpl

inline static float htof(const unsigned short h)
{
#if defined(__ARM_NEON__) // TODO: Verify this
float output;
vst1q_f32(&output, vcvt_f32_f16(vld1_u16(&h)));
return output;
#if defined(__ARM_NEON__)
__fp16 input;
std::memcpy(static_cast<void *>(&input), static_cast<const void *>(&h), sizeof(input));
return static_cast<float>(input);
#else
return _cvtsh_ss(h); // Convert half 16bit float to full 32bit float
#endif
Expand Down
2 changes: 1 addition & 1 deletion lib/scene/rdl2/SceneVariables.cc
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ SceneObjectInterface SceneVariables::declare(SceneClass& sceneClass)
SceneClass::sComment,
"(Frames per second) Affects motion blur.");

sSceneScaleKey = sceneClass.declareAttribute<Float>("scene_scale", 0.01f, {"scene scale"});
sSceneScaleKey = sceneClass.declareAttribute<Float>("scene_scale", 1.0f, {"scene scale"});
sceneClass.setMetadata(sSceneScaleKey, "label", "scene scale");
sceneClass.setMetadata(sSceneScaleKey,
SceneClass::sComment,
Expand Down
4 changes: 2 additions & 2 deletions mod/python/py_scene_rdl2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
set(component __${PACKAGE_NAME}__)

if (NOT DEFINED BOOST_PYTHON_COMPONENT_NAME)
# may need to be, e.g. python36, python39
# may need to be, e.g. python36, python311
set(BOOST_PYTHON_COMPONENT_NAME python)
endif()

# may need to be, e.g. python36, python39
# may need to be, e.g. python36, python311

find_package(Python COMPONENTS Interpreter Development)
find_package(Boost REQUIRED
Expand Down
2 changes: 1 addition & 1 deletion package.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def version():
'opt_level-optdebug',
'refplat-vfx2022.0',
'gcc-9.3.x.1',
'python-3.9'
'python-3.11'
],
]

Expand Down