diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2019-05-02 16:45:31 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-03 16:42:49 +0300 |
| commit | 68b15fc3ad4f74be192150d3a2fb35e7ef2d4edd (patch) | |
| tree | 26c2aa7b37c3520417acf13b4a80c3023346b1c2 /intern/cycles/render/osl.h | |
| parent | dba4684f82a179a5c8abdae5940bc7c35e65a1a7 (diff) | |
Cycles: support loading images from arbitrary OpenColorIO color space
These are the internal changes to Cycles, for Blender integration there are no
functional changes in this commit.
Images are converted to scene linear color space on file load, and on reading
from the OpenImageIO texture cache. 8-bit images are compressed with the sRGB
transfer function to avoid precision loss while keeping memory usages low. This
also means that for common cases of 8-bit sRGB images no conversion happens at
all on image loading.
Initial patch by Lukas, completed by Brecht.
Differential Revision: https://developer.blender.org/D3491
Diffstat (limited to 'intern/cycles/render/osl.h')
| -rw-r--r-- | intern/cycles/render/osl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h index 773252ce9dc..ac73f1d3c24 100644 --- a/intern/cycles/render/osl.h +++ b/intern/cycles/render/osl.h @@ -153,7 +153,8 @@ class OSLCompiler { void parameter_attribute(const char *name, ustring s); - void parameter_texture(const char *name, ustring filename, int svm_slot); + void parameter_texture(const char *name, ustring filename, ustring colorspace); + void parameter_texture(const char *name, int svm_slot); void parameter_texture_ies(const char *name, int svm_slot); ShaderType output_type() |