StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr545'

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-10-26 17:08:36 +01:00
commit 32c3302462
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/widget/videosurface.cpp
View File

@ -82,8 +82,8 @@ void VideoSurface::initializeGL()
"attribute vec4 vertices;" "attribute vec4 vertices;"
"varying vec2 coords;" "varying vec2 coords;"
"void main() {" "void main() {"
" gl_Position = vec4(vertices.xy,0.0,1.0);" " gl_Position = vec4(vertices.xy, 0.0, 1.0);"
" coords = vertices.xy*vec2(0.5,0.5)+vec2(0.5,0.5);" " coords = vertices.xy*vec2(0.5, 0.5) + vec2(0.5, 0.5);"
"}"); "}");
// brg frag-shader // brg frag-shader
@ -92,7 +92,7 @@ void VideoSurface::initializeGL()
"varying vec2 coords;" "varying vec2 coords;"
"void main() {" "void main() {"
" vec4 color = texture2D(texture0,coords*vec2(1.0, -1.0));" " vec4 color = texture2D(texture0,coords*vec2(1.0, -1.0));"
" gl_FragColor = vec4(color.b, color.g, color.r, 1);" " gl_FragColor = vec4(color.bgr, 1.0);"
"}"); "}");
bgrProgramm->bindAttributeLocation("vertices", 0); bgrProgramm->bindAttributeLocation("vertices", 0);
@ -104,8 +104,8 @@ void VideoSurface::initializeGL()
"attribute vec4 vertices;" "attribute vec4 vertices;"
"varying vec2 coords;" "varying vec2 coords;"
"void main() {" "void main() {"
" gl_Position = vec4(vertices.xy,0.0,1.0);" " gl_Position = vec4(vertices.xy, 0.0, 1.0);"
" coords = vertices.xy*vec2(0.5,0.5)+vec2(0.5,0.5);" " coords = vertices.xy*vec2(0.5, 0.5) + vec2(0.5, 0.5);"
"}"); "}");
// yuv frag-shader // yuv frag-shader
@ -113,9 +113,9 @@ void VideoSurface::initializeGL()
"uniform sampler2D texture0;" "uniform sampler2D texture0;"
"varying vec2 coords;" "varying vec2 coords;"
"void main() {" "void main() {"
" vec3 yuv = texture2D(texture0,coords*vec2(1.0, -1.0)) - vec3(0,0.5,0.5);" " vec3 yuv = texture2D(texture0,coords*vec2(1.0, -1.0)).rgb - vec3(0.0, 0.5, 0.5);"
" vec3 rgb = mat3(1,1,1,0,-0.21482,2.12798,1.28033,-0.38059,0) * yuv;" " vec3 rgb = mat3(1.0, 1.0, 1.0, 0.0, -0.21482, 2.12798, 1.28033, -0.38059, 0.0)*yuv;"
" gl_FragColor = vec4(rgb,1);" " gl_FragColor = vec4(rgb, 1.0);"
"}"); "}");
yuvProgramm->bindAttributeLocation("vertices", 0); yuvProgramm->bindAttributeLocation("vertices", 0);