blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #986 from ammen99/master 

gles2: pre-multiply alpha and fix blending function
This commit is contained in:
emersion 2018-05-19 09:21:35 +01:00 committed by GitHub
parent 98088e78df 47ffd0e184
commit b547279625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
render/gles2/renderer.c
View File

@ -42,7 +42,7 @@ static void gles2_begin(struct wlr_renderer *wlr_renderer, uint32_t width,
// enable transparency
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
// XXX: maybe we should save output projection and remove some of the need
// for users to sling matricies themselves

9
render/gles2/shaders.c
View File

@ -63,8 +63,7 @@ const GLchar tex_fragment_src_rgba[] =
"uniform float alpha;\n"
"\n"
"void main() {\n"
" gl_FragColor.rgb = texture2D(tex, v_texcoord).rgb;\n"
" gl_FragColor.a = alpha * texture2D(tex, v_texcoord).a;\n"
" gl_FragColor = texture2D(tex, v_texcoord) * alpha;\n"
"}\n";
const GLchar tex_fragment_src_rgbx[] =
@ -74,8 +73,7 @@ const GLchar tex_fragment_src_rgbx[] =
"uniform float alpha;\n"
"\n"
"void main() {\n"
" gl_FragColor.rgb = texture2D(tex, v_texcoord).rgb;\n"
" gl_FragColor.a = alpha;\n"
" gl_FragColor = vec4(texture2D(tex, v_texcoord).rgb, 1.0) * alpha;\n"
"}\n";
const GLchar tex_fragment_src_external[] =
@ -86,6 +84,5 @@ const GLchar tex_fragment_src_external[] =
"uniform float alpha;\n"
"\n"
"void main() {\n"
" vec4 col = texture2D(texture0, v_texcoord);\n"
" gl_FragColor = vec4(col.rgb, col.a * alpha);\n"
" gl_FragColor = texture2D(texture0, v_texcoord) * alpha;\n"
"}\n";