diff options
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_environment_texture.osl | 7 | ||||
| -rw-r--r-- | intern/cycles/kernel/shaders/node_image_texture.osl | 17 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_image.h | 12 | ||||
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 2 |
4 files changed, 31 insertions, 7 deletions
diff --git a/intern/cycles/kernel/shaders/node_environment_texture.osl b/intern/cycles/kernel/shaders/node_environment_texture.osl index 36b2f755c20..bddef418c3d 100644 --- a/intern/cycles/kernel/shaders/node_environment_texture.osl +++ b/intern/cycles/kernel/shaders/node_environment_texture.osl @@ -48,6 +48,7 @@ shader node_environment_texture( string filename = "", string projection = "Equirectangular", string color_space = "sRGB", + int is_float = 1, output color Color = 0.0, output float Alpha = 1.0) { @@ -66,9 +67,13 @@ shader node_environment_texture( /* todo: use environment for better texture filtering of equirectangular */ Color = (color)texture(filename, p[0], 1.0 - p[1], "wrap", "periodic", "alpha", Alpha); - if (isconnected(Alpha)) + if (isconnected(Alpha)) { Color = color_unpremultiply(Color, Alpha); + if (!is_float) + Color = min(Color, 1.0); + } + if (color_space == "sRGB") Color = color_srgb_to_scene_linear(Color); } diff --git a/intern/cycles/kernel/shaders/node_image_texture.osl b/intern/cycles/kernel/shaders/node_image_texture.osl index c7ec8726ae2..6ccc7ebc651 100644 --- a/intern/cycles/kernel/shaders/node_image_texture.osl +++ b/intern/cycles/kernel/shaders/node_image_texture.osl @@ -19,12 +19,16 @@ #include "stdosl.h" #include "node_color.h" -color image_texture_lookup(string filename, string color_space, float u, float v, output float Alpha, int use_alpha) +color image_texture_lookup(string filename, string color_space, float u, float v, output float Alpha, int use_alpha, int is_float) { color rgb = (color)texture(filename, u, 1.0 - v, "wrap", "periodic", "alpha", Alpha); - if (use_alpha) + if (use_alpha) { rgb = color_unpremultiply(rgb, Alpha); + + if (!is_float) + rgb = min(rgb, 1.0); + } if (color_space == "sRGB") rgb = color_srgb_to_scene_linear(rgb); @@ -40,6 +44,7 @@ shader node_image_texture( string color_space = "sRGB", string projection = "Flat", float projection_blend = 0.0, + int is_float = 1, output color Color = 0.0, output float Alpha = 1.0) { @@ -51,7 +56,7 @@ shader node_image_texture( int use_alpha = isconnected(Alpha); if (projection == "Flat") { - Color = image_texture_lookup(filename, color_space, p[0], p[1], Alpha, use_alpha); + Color = image_texture_lookup(filename, color_space, p[0], p[1], Alpha, use_alpha, is_float); } else if (projection == "Box") { /* object space normal */ @@ -116,15 +121,15 @@ shader node_image_texture( float tmp_alpha; if (weight[0] > 0.0) { - Color += weight[0] * image_texture_lookup(filename, color_space, p[1], p[2], tmp_alpha, use_alpha); + Color += weight[0] * image_texture_lookup(filename, color_space, p[1], p[2], tmp_alpha, use_alpha, is_float); Alpha += weight[0] * tmp_alpha; } if (weight[1] > 0.0) { - Color += weight[1] * image_texture_lookup(filename, color_space, p[0], p[2], tmp_alpha, use_alpha); + Color += weight[1] * image_texture_lookup(filename, color_space, p[0], p[2], tmp_alpha, use_alpha, is_float); Alpha += weight[1] * tmp_alpha; } if (weight[2] > 0.0) { - Color += weight[2] * image_texture_lookup(filename, color_space, p[1], p[0], tmp_alpha, use_alpha); + Color += weight[2] * image_texture_lookup(filename, color_space, p[1], p[0], tmp_alpha, use_alpha, is_float); Alpha += weight[2] * tmp_alpha; } } diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h index b2f20366573..c7551a72638 100644 --- a/intern/cycles/kernel/svm/svm_image.h +++ b/intern/cycles/kernel/svm/svm_image.h @@ -93,6 +93,12 @@ __device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, u r.x *= invw; r.y *= invw; r.z *= invw; + + if(id >= TEX_NUM_FLOAT_IMAGES) { + r.x = min(r.x, 1.0f); + r.y = min(r.y, 1.0f); + r.z = min(r.z, 1.0f); + } } if(srgb) { @@ -234,6 +240,12 @@ __device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, u r.x *= invw; r.y *= invw; r.z *= invw; + + if(id >= TEX_NUM_FLOAT_IMAGES) { + r.x = min(r.x, 1.0f); + r.y = min(r.y, 1.0f); + r.z = min(r.z, 1.0f); + } } if(srgb) { diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 083b79e8aaf..983907a1194 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -249,6 +249,7 @@ void ImageTextureNode::compile(OSLCompiler& compiler) compiler.parameter("color_space", "sRGB"); compiler.parameter("projection", projection); compiler.parameter("projection_blend", projection_blend); + compiler.parameter("is_float", is_float); compiler.add(this, "node_image_texture"); } @@ -368,6 +369,7 @@ void EnvironmentTextureNode::compile(OSLCompiler& compiler) compiler.parameter("color_space", "Linear"); else compiler.parameter("color_space", "sRGB"); + compiler.parameter("is_float", is_float); compiler.add(this, "node_environment_texture"); } |