Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2017-09-27 01:39:53 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2017-10-04 22:11:14 +0300
commite3e16cecc4f080edbbd14e4bf1cfc580c5957d62 (patch)
tree5b9da903526442acb10b48d2ccee5686a00a1017 /intern/cycles/render
parent5b7d6ea54b2fc35b8b12c667f5bf9a1c9c46d5c2 (diff)
Code refactor: remove rng_state buffer and compute hash on the fly.
A little faster on some benchmark scenes, a little slower on others, seems about performance neutral on average and saves a little memory.
Diffstat (limited to 'intern/cycles/render')
-rw-r--r--intern/cycles/render/buffers.cpp11
-rw-r--r--intern/cycles/render/buffers.h3
-rw-r--r--intern/cycles/render/session.cpp2
3 files changed, 0 insertions, 16 deletions
diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp
index cf402c3f214..cf66e5385c9 100644
--- a/intern/cycles/render/buffers.cpp
+++ b/intern/cycles/render/buffers.cpp
@@ -108,7 +108,6 @@ RenderTile::RenderTile()
stride = 0;
buffer = 0;
- rng_state = 0;
buffers = NULL;
}
@@ -131,11 +130,6 @@ void RenderBuffers::device_free()
device->mem_free(buffer);
buffer.clear();
}
-
- if(rng_state.device_pointer) {
- device->mem_free(rng_state);
- rng_state.clear();
- }
}
void RenderBuffers::reset(Device *device, BufferParams& params_)
@@ -149,11 +143,6 @@ void RenderBuffers::reset(Device *device, BufferParams& params_)
buffer.resize(params.width*params.height*params.get_passes_size());
device->mem_alloc("render_buffer", buffer, MEM_READ_WRITE);
device->mem_zero(buffer);
-
- /* allocate rng state */
- rng_state.resize(params.width, params.height);
-
- device->mem_alloc("rng_state", rng_state, MEM_READ_WRITE);
}
bool RenderBuffers::copy_from_device(Device *from_device)
diff --git a/intern/cycles/render/buffers.h b/intern/cycles/render/buffers.h
index e56556c8abe..552dabe178a 100644
--- a/intern/cycles/render/buffers.h
+++ b/intern/cycles/render/buffers.h
@@ -74,8 +74,6 @@ public:
/* float buffer */
device_vector<float> buffer;
- /* random number generator state */
- device_vector<uint> rng_state;
Device *device;
@@ -149,7 +147,6 @@ public:
int tile_index;
device_ptr buffer;
- device_ptr rng_state;
RenderBuffers *buffers;
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index f68efe38add..69cfb5c3e6e 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -384,7 +384,6 @@ bool Session::acquire_tile(Device *tile_device, RenderTile& rtile)
tile_manager.state.buffer.get_offset_stride(rtile.offset, rtile.stride);
rtile.buffer = buffers->buffer.device_pointer;
- rtile.rng_state = buffers->rng_state.device_pointer;
rtile.buffers = buffers;
tile->buffers = buffers;
@@ -442,7 +441,6 @@ bool Session::acquire_tile(Device *tile_device, RenderTile& rtile)
tile->buffers->params.get_offset_stride(rtile.offset, rtile.stride);
rtile.buffer = tile->buffers->buffer.device_pointer;
- rtile.rng_state = tile->buffers->rng_state.device_pointer;
rtile.buffers = tile->buffers;
rtile.sample = 0;