diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-27 20:43:15 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-27 20:43:15 +0400 |
| commit | d376a1b7405ab5825791a0caea20391d5ad6163d (patch) | |
| tree | 376bd763ac49279e4754ec50052765128db0660e /intern/opencolorio | |
| parent | 514e322895c06dd25d95f2c239f24b74a6ec1dff (diff) | |
Apparently better not to use values like 1.0f in GLSL code
Fix from debug session of self and Ton, was affecting OSX
builds, making GLSL display transform not working on this
platform.
Diffstat (limited to 'intern/opencolorio')
| -rw-r--r-- | intern/opencolorio/ocio_impl_glsl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc index addca2ae96a..13c2fc07a9a 100644 --- a/intern/opencolorio/ocio_impl_glsl.cc +++ b/intern/opencolorio/ocio_impl_glsl.cc @@ -88,11 +88,11 @@ static const char *g_fragShaderText = "" "void main()\n" "{\n" " vec4 col = texture2D(tex1, gl_TexCoord[0].st);\n" -" if (predivide == false || col[3] == 1.0f || col[3] == 0.0f) {\n" +" if (predivide == false || col[3] == 1.0 || col[3] == 0.0) {\n" " gl_FragColor = OCIODisplay(col, tex2);\n" " } else {\n" " float alpha = col[3];\n" -" float inv_alpha = 1.0f / alpha;\n" +" float inv_alpha = 1.0 / alpha;\n" "\n" " col[0] *= inv_alpha;\n" " col[1] *= inv_alpha;\n" |