diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-31 19:18:13 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-31 19:18:13 +0400 |
| commit | b5595298d36a5023cc33ed41463fd6c032f2ec7b (patch) | |
| tree | e3a404393ff4a8e39a991f9a3d8ca78c0d3033a7 /intern/cycles/device/device.h | |
| parent | 1b4487e813edac9c5b57b6d5c6175c46c4a54b1c (diff) | |
Cycles code refactoring: change displace kernel into more generic shader
evaluate kernel, added background shader evaluate.
Diffstat (limited to 'intern/cycles/device/device.h')
| -rw-r--r-- | intern/cycles/device/device.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index a6a81e7b326..af9bb694c1b 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -52,7 +52,7 @@ enum MemoryType { class DeviceTask { public: - typedef enum { PATH_TRACE, TONEMAP, DISPLACE } Type; + typedef enum { PATH_TRACE, TONEMAP, SHADER } Type; Type type; int x, y, w, h; @@ -63,9 +63,10 @@ public: int resolution; int offset, stride; - device_ptr displace_input; - device_ptr displace_offset; - int displace_x, displace_w; + device_ptr shader_input; + device_ptr shader_output; + int shader_eval_type; + int shader_x, shader_w; DeviceTask(Type type = PATH_TRACE); |