blender
/
blender
136
406
Fork 587
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Fix: Add cast to atof for CYCLES_CONCURRENT_STATES_FACTOR env variable parsing. 

The conversion from double to float was causing a build failure.

Differential Revision: https://developer.blender.org/D12946
This commit is contained in:
William Leeson 2021-10-20 20:51:56 +02:00
parent 704d077d8f
commit f0df0e9e07
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/device/hip/queue.cpp
View File

@ -53,7 +53,7 @@ int HIPDeviceQueue::num_concurrent_states(const size_t state_size) const
const char *factor_str = getenv("CYCLES_CONCURRENT_STATES_FACTOR");
if (factor_str) {
float factor = atof(factor_str);
float factor = (float)atof(factor_str);
if (!factor)
VLOG(3) << "CYCLES_CONCURRENT_STATES_FACTOR evaluated to 0";
num_states = max((int)(num_states * factor), 1024);

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit 75e46177f36a49ad36b917e641ee1586ddef7092
Subproject commit 80d9e7ee122c626cbbcd1da554683bce79f8d3df

2
release/scripts/addons

@ -1 +1 @@
Subproject commit f10ca8c156169b24e70027a43f718f99571d280f
Subproject commit e68c0118c13c3575e6096ad2dc7fb4434eadf38e

2
source/tools

@ -1 +1 @@
Subproject commit 5061594ee62b8eabf705443a5483c7a1dfaa8789
Subproject commit 7c5acb95df918503d11cfc43172ce13901019289