diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-07 16:27:18 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-07 16:27:18 +0400 |
| commit | 9fba458a7fe535e60f5c6beee9757fe25ffe2d49 (patch) | |
| tree | e625eb73d3da32a01c84385e1976f81d2f8b92bd /intern/cycles/render/scene.h | |
| parent | bdf731f03d727d3862537c59fa11477b77eb60b0 (diff) | |
Cycles: float texture support. Due to GPU limitations there are now 95 byte,
and 5 float image textures. For CPU render this limit will be lifted later
on with image cache support. Patch by Mike Farnsworth.
Also changed color space option in image/environment texture node, to show
options Color and Non-Color Data, instead of sRGB and Linear, this is more
descriptive, and it was not really correct to equate Non-Color Data with
Linear.
Diffstat (limited to 'intern/cycles/render/scene.h')
| -rw-r--r-- | intern/cycles/render/scene.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index c251174b607..0a4f0ef5d95 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -92,7 +92,8 @@ public: device_vector<uint> sobol_directions; /* images */ - device_vector<uchar4> tex_image[TEX_IMAGE_MAX]; + device_vector<uchar4> tex_image[TEX_NUM_IMAGES]; + device_vector<float4> tex_float_image[TEX_NUM_FLOAT_IMAGES]; KernelData data; }; |