From 070a668d04844610059aaedc80c49e9038fd1779 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 21 Oct 2017 01:09:59 +0200 Subject: Code refactor: move more memory allocation logic into device API. * Remove tex_* and pixels_* functions, replace by mem_*. * Add MEM_TEXTURE and MEM_PIXELS as memory types recognized by devices. * No longer create device_memory and call mem_* directly, always go through device_only_memory, device_vector and device_pixels. --- intern/cycles/render/session.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'intern/cycles/render/session.cpp') diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 4642dcfa9a1..74cfd02e1a4 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -106,11 +106,11 @@ Session::~Session() delete display; display = new DisplayBuffer(device, false); - display->reset(device, buffers->params); + display->reset(buffers->params); tonemap(params.samples); progress.set_status("Writing Image", params.output_path); - display->write(device, params.output_path); + display->write(params.output_path); } /* clean up */ @@ -399,7 +399,7 @@ bool Session::acquire_tile(Device *tile_device, RenderTile& rtile) /* allocate buffers */ tile->buffers = new RenderBuffers(tile_device); - tile->buffers->reset(tile_device, buffer_params); + tile->buffers->reset(buffer_params); } tile->buffers->params.get_offset_stride(rtile.offset, rtile.stride); @@ -756,9 +756,9 @@ void Session::reset_(BufferParams& buffer_params, int samples) { if(buffers && buffer_params.modified(tile_manager.params)) { gpu_draw_ready = false; - buffers->reset(device, buffer_params); + buffers->reset(buffer_params); if(display) { - display->reset(device, buffer_params); + display->reset(buffer_params); } } @@ -923,7 +923,7 @@ void Session::render() { /* Clear buffers. */ if(buffers && tile_manager.state.sample == tile_manager.range_start_sample) { - buffers->zero(device); + buffers->zero(); } /* Add path trace task. */ -- cgit v1.2.3