sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for fix in alpha de-premul

Browse Source 
We do not need to premul shader result, opengl
is already configured for straight alpha.
This commit is contained in:
Sergey Sharybin 2013-04-27 17:50:11 +00:00
parent 1fe4a27305
commit 69b0b0a624
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/opencolorio/ocio_impl_glsl.cc
View File

@ -79,6 +79,10 @@ typedef struct OCIO_GLSLDrawState {
} OCIO_GLSLDrawState;
/* Hardcoded to do alpha predivide before color space conversion */
/* NOTE: This is true we only do de-premul here and NO premul
* and the reason is simple -- opengl is always configured
* for straight alpha at this moment
*/
static const char *g_fragShaderText = ""
"\n"
"uniform sampler2D tex1;\n"
@ -99,10 +103,6 @@ static const char *g_fragShaderText = ""
" col[2] *= inv_alpha;\n"
"\n"
" gl_FragColor = OCIODisplay(col, tex2);\n"
"\n"
" gl_FragColor[0] *= alpha;\n"
" gl_FragColor[1] *= alpha;\n"
" gl_FragColor[2] *= alpha;\n"
" }\n"
"\n"
"}\n";