kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: reduce float/double conversions

Browse Source
This commit is contained in:
Campbell Barton 2014-10-08 00:09:36 +02:00
parent e2522b4a29
commit be3a6d78e8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/blender/blender_session.cpp
View File

@ -830,7 +830,7 @@ void BlenderSession::update_status_progress()
if(background) { if(background) {
if(progress>0) if(progress>0)
remaining_time = (1-progress) * (total_time / progress); remaining_time = (1.0 - (double)progress) * (total_time / (double)progress);
scene += " | " + b_scene.name(); scene += " | " + b_scene.name();
if(b_rlay_name != "") if(b_rlay_name != "")
@ -849,7 +849,7 @@ void BlenderSession::update_status_progress()
timestatus += "Remaining:" + string(time_str) + " | "; timestatus += "Remaining:" + string(time_str) + " | ";
} }
timestatus += string_printf("Mem:%.2fM, Peak:%.2fM", mem_used, mem_peak); timestatus += string_printf("Mem:%.2fM, Peak:%.2fM", (double)mem_used, (double)mem_peak);
if(status.size() > 0) if(status.size() > 0)
status = " | " + status; status = " | " + status;

6
intern/cycles/render/shader.cpp
View File

@ -83,7 +83,7 @@ static void beckmann_table_rows(float *table, int row_from, int row_to)
} }
/* CDF of P22_{omega_i}(x_slope, 1, 1), Eq. (10) */ /* CDF of P22_{omega_i}(x_slope, 1, 1), Eq. (10) */
CDF_P22_omega_i[index_slope_x] = CDF_P22_omega_i[index_slope_x - 1] + P22_omega_i; CDF_P22_omega_i[index_slope_x] = CDF_P22_omega_i[index_slope_x - 1] + (double)P22_omega_i;
} }
/* renormalize CDF_P22_omega_i */ /* renormalize CDF_P22_omega_i */
@ -106,8 +106,8 @@ static void beckmann_table_rows(float *table, int row_from, int row_to)
/* store value */ /* store value */
table[index_U + index_theta*BECKMANN_TABLE_SIZE] = (float)( table[index_U + index_theta*BECKMANN_TABLE_SIZE] = (float)(
interp * slope_x[index_slope_x - 1] interp * slope_x[index_slope_x - 1] +
+ (1.0f-interp) * slope_x[index_slope_x]); (1.0 - interp) * slope_x[index_slope_x]);
} }
} }
} }