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/kernel/svm/svm_image.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/kernel/svm/svm_image.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_image.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h index 073021bdd54..3d737b483cb 100644 --- a/intern/cycles/kernel/svm/svm_image.h +++ b/intern/cycles/kernel/svm/svm_image.h @@ -130,11 +130,11 @@ __device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y) case 92: r = kernel_tex_image_interp(__tex_image_092, x, y); break; case 93: r = kernel_tex_image_interp(__tex_image_093, x, y); break; case 94: r = kernel_tex_image_interp(__tex_image_094, x, y); break; - case 95: r = kernel_tex_image_interp(__tex_image_095, x, y); break; - case 96: r = kernel_tex_image_interp(__tex_image_096, x, y); break; - case 97: r = kernel_tex_image_interp(__tex_image_097, x, y); break; - case 98: r = kernel_tex_image_interp(__tex_image_098, x, y); break; - case 99: r = kernel_tex_image_interp(__tex_image_099, x, y); break; + case 95: r = kernel_tex_image_interp(__tex_image_float_095, x, y); break; + case 96: r = kernel_tex_image_interp(__tex_image_float_096, x, y); break; + case 97: r = kernel_tex_image_interp(__tex_image_float_097, x, y); break; + case 98: r = kernel_tex_image_interp(__tex_image_float_098, x, y); break; + case 99: r = kernel_tex_image_interp(__tex_image_float_099, x, y); break; default: kernel_assert(0); return make_float4(0.0f, 0.0f, 0.0f, 0.0f); |