diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-05 02:34:30 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-05 17:22:04 +0300 |
commit | 5801ef71e40bc932c69e67f06076cd8b41132e52 (patch) | |
tree | 1fec0c65b9ead5720f54229497060af1f0194bbb /intern/cycles/render/buffers.cpp | |
parent | 5475314f4955dbc3af305577a26fe0b537380313 (diff) |
Code refactor: device memory cleanups, preparing for mapped host memory.
Diffstat (limited to 'intern/cycles/render/buffers.cpp')
-rw-r--r-- | intern/cycles/render/buffers.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp index 23125f66d66..ac675dc7b39 100644 --- a/intern/cycles/render/buffers.cpp +++ b/intern/cycles/render/buffers.cpp @@ -173,8 +173,8 @@ bool RenderBuffers::get_denoising_pass_rect(int offset, float exposure, int samp /* Approximate variance as E[x^2] - 1/N * (E[x])^2, since online variance * update does not work efficiently with atomics in the kernel. */ int mean_offset = offset - components; - float *mean = (float*)buffer.data_pointer + mean_offset; - float *var = (float*)buffer.data_pointer + offset; + float *mean = buffer.data() + mean_offset; + float *var = buffer.data() + offset; assert(mean_offset >= 0); if(components == 1) { @@ -194,7 +194,7 @@ bool RenderBuffers::get_denoising_pass_rect(int offset, float exposure, int samp } } else { - float *in = (float*)buffer.data_pointer + offset; + float *in = buffer.data() + offset; if(components == 1) { for(int i = 0; i < size; i++, in += pass_stride, pixels++) { @@ -228,7 +228,7 @@ bool RenderBuffers::get_pass_rect(PassType type, float exposure, int sample, int continue; } - float *in = (float*)buffer.data_pointer + pass_offset; + float *in = buffer.data() + pass_offset; int pass_stride = params.get_passes_size(); float scale = (pass.filter)? 1.0f/(float)sample: 1.0f; @@ -295,7 +295,7 @@ bool RenderBuffers::get_pass_rect(PassType type, float exposure, int sample, int pass_offset += color_pass.components; } - float *in_divide = (float*)buffer.data_pointer + pass_offset; + float *in_divide = buffer.data() + pass_offset; for(int i = 0; i < size; i++, in += pass_stride, in_divide += pass_stride, pixels += 3) { float3 f = make_float3(in[0], in[1], in[2]); @@ -344,7 +344,7 @@ bool RenderBuffers::get_pass_rect(PassType type, float exposure, int sample, int pass_offset += color_pass.components; } - float *in_weight = (float*)buffer.data_pointer + pass_offset; + float *in_weight = buffer.data() + pass_offset; for(int i = 0; i < size; i++, in += pass_stride, in_weight += pass_stride, pixels += 4) { float4 f = make_float4(in[0], in[1], in[2], in[3]); |