diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-31 03:49:38 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-31 03:49:38 +0400 |
| commit | 29f6616d609fbd92cf313b0fdec555c2fcb4ede0 (patch) | |
| tree | e0c9500368c5210071cb841ea86f5674b0cf6f25 /intern/cycles/device/device_multi.cpp | |
| parent | 60ff60dcdc9f43891fb8a19e10f9bb7964a539bf (diff) | |
Cycles: viewport render now takes scene color management settings into account,
except for curves, that's still missing from the OpenColorIO GLSL shader.
The pixels are stored in a half float texture, converterd from full float with
native GPU instructions and SIMD on the CPU, so it should be pretty quick.
Using a GLSL shader is useful for GPU render because it avoids a copy through
CPU memory.
Diffstat (limited to 'intern/cycles/device/device_multi.cpp')
| -rw-r--r-- | intern/cycles/device/device_multi.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp index af6ca9e1fbd..4df0fdbd4c7 100644 --- a/intern/cycles/device/device_multi.cpp +++ b/intern/cycles/device/device_multi.cpp @@ -261,7 +261,6 @@ public: if(sub.device == sub_device) { if(tile.buffer) tile.buffer = sub.ptr_map[tile.buffer]; if(tile.rng_state) tile.rng_state = sub.ptr_map[tile.rng_state]; - if(tile.rgba) tile.rgba = sub.ptr_map[tile.rgba]; } } } @@ -290,7 +289,8 @@ public: tasks.pop_front(); if(task.buffer) subtask.buffer = sub.ptr_map[task.buffer]; - if(task.rgba) subtask.rgba = sub.ptr_map[task.rgba]; + if(task.rgba_byte) subtask.rgba_byte = sub.ptr_map[task.rgba_byte]; + if(task.rgba_half) subtask.rgba_half = sub.ptr_map[task.rgba_half]; if(task.shader_input) subtask.shader_input = sub.ptr_map[task.shader_input]; if(task.shader_output) subtask.shader_output = sub.ptr_map[task.shader_output]; |