Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: some small code refactoring related to buffer parameters.

Browse Source
This commit is contained in:
Brecht Van Lommel
2011-12-21 13:48:35 +00:00
parent 045a91a378
commit 34909c64e5
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/render/buffers.h
View File

@@ -56,6 +56,12 @@ public:
full_height = 0; full_height = 0;
} }
void get_offset_stride(int& offset, int& stride)
{
offset = -(full_x + full_y*width);
stride = width;
}
bool modified(const BufferParams& params) bool modified(const BufferParams& params)
{ {
return !(full_x == params.full_x return !(full_x == params.full_x

24
intern/cycles/render/session.cpp
View File

@@ -515,10 +515,8 @@ void Session::update_scene()
knows nothing about progressive or cropped rendering, it just gets the knows nothing about progressive or cropped rendering, it just gets the
image dimensions passed in */ image dimensions passed in */
Camera *cam = scene->camera; Camera *cam = scene->camera;
float progressive_x = tile_manager.state.width/(float)tile_manager.params.width; int width = tile_manager.state.buffer.full_width;
float progressive_y = tile_manager.state.height/(float)tile_manager.params.height; int height = tile_manager.state.buffer.full_height;
int width = tile_manager.params.full_width*progressive_x;
int height = tile_manager.params.full_height*progressive_y;
if(width != cam->width || height != cam->height) { if(width != cam->width || height != cam->height) {
cam->width = width; cam->width = width;
@@ -574,16 +572,15 @@ void Session::path_trace(Tile& tile)
/* add path trace task */ /* add path trace task */
DeviceTask task(DeviceTask::PATH_TRACE); DeviceTask task(DeviceTask::PATH_TRACE);
task.x = tile_manager.state.full_x + tile.x; task.x = tile_manager.state.buffer.full_x + tile.x;
task.y = tile_manager.state.full_y + tile.y; task.y = tile_manager.state.buffer.full_y + tile.y;
task.w = tile.w; task.w = tile.w;
task.h = tile.h; task.h = tile.h;
task.buffer = buffers->buffer.device_pointer; task.buffer = buffers->buffer.device_pointer;
task.rng_state = buffers->rng_state.device_pointer; task.rng_state = buffers->rng_state.device_pointer;
task.sample = tile_manager.state.sample; task.sample = tile_manager.state.sample;
task.resolution = tile_manager.state.resolution; task.resolution = tile_manager.state.resolution;
task.offset = -(tile_manager.state.full_x + tile_manager.state.full_y*tile_manager.state.width); tile_manager.state.buffer.get_offset_stride(task.offset, task.stride);
task.stride = tile_manager.state.width;
device->task_add(task); device->task_add(task);
} }
@@ -593,16 +590,15 @@ void Session::tonemap()
/* add tonemap task */ /* add tonemap task */
DeviceTask task(DeviceTask::TONEMAP); DeviceTask task(DeviceTask::TONEMAP);
task.x = tile_manager.state.full_x; task.x = tile_manager.state.buffer.full_x;
task.y = tile_manager.state.full_y; task.y = tile_manager.state.buffer.full_y;
task.w = tile_manager.state.width; task.w = tile_manager.state.buffer.width;
task.h = tile_manager.state.height; task.h = tile_manager.state.buffer.height;
task.rgba = display->rgba.device_pointer; task.rgba = display->rgba.device_pointer;
task.buffer = buffers->buffer.device_pointer; task.buffer = buffers->buffer.device_pointer;
task.sample = tile_manager.state.sample; task.sample = tile_manager.state.sample;
task.resolution = tile_manager.state.resolution; task.resolution = tile_manager.state.resolution;
task.offset = -(tile_manager.state.full_x + tile_manager.state.full_y*tile_manager.state.width); tile_manager.state.buffer.get_offset_stride(task.offset, task.stride);
task.stride = tile_manager.state.width;
if(task.w > 0 && task.h > 0) { if(task.w > 0 && task.h > 0) {
device->task_add(task); device->task_add(task);

16
intern/cycles/render/tile.cpp
View File

@@ -55,10 +55,7 @@ void TileManager::reset(BufferParams& params_, int samples_)
samples = samples_; samples = samples_;
state.full_x = 0; state.buffer = BufferParams();
state.full_y = 0;
state.width = 0;
state.height = 0;
state.sample = -1; state.sample = -1;
state.resolution = start_resolution; state.resolution = start_resolution;
state.tiles.clear(); state.tiles.clear();
@@ -92,10 +89,13 @@ void TileManager::set_tiles()
} }
} }
state.full_x = params.full_x/resolution; state.buffer.width = image_w;
state.full_y = params.full_y/resolution; state.buffer.height = image_h;
state.width = image_w;
state.height = image_h; state.buffer.full_x = params.full_x/resolution;
state.buffer.full_y = params.full_y/resolution;
state.buffer.full_width = max(1, params.full_width/resolution);
state.buffer.full_height = max(1, params.full_height/resolution);
} }
bool TileManager::done() bool TileManager::done()

6
intern/cycles/render/tile.h
View File

@@ -41,11 +41,9 @@ public:
class TileManager { class TileManager {
public: public:
BufferParams params; BufferParams params;
struct State { struct State {
int full_x; BufferParams buffer;
int full_y;
int width;
int height;
int sample; int sample;
int resolution; int resolution;
list<Tile> tiles; list<Tile> tiles;