Skip to content

V
vlc-2-2
Commit a27daf20 authored by Nicolas Bertrand's avatar Nicolas Bertrand Committed by Jean-Baptiste Kempf
Browse files
Options

OpenGL: take planes in account in DrawWithShaders 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 47d20839
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 5 deletions
modules/video_output/opengl.c
View file @ a27daf20
...@@ -923,10 +923,15 @@ static void DrawWithShaders(vout_display_opengl_t *vgl, ...@@ -923,10 +923,15 @@ static void DrawWithShaders(vout_display_opengl_t *vgl,
{ {
vgl->UseProgram(vgl->program[program]); vgl->UseProgram(vgl->program[program]);
if (program == 0) { if (program == 0) {
vgl->Uniform4fv(vgl->GetUniformLocation(vgl->program[0], "Coefficient"), 4, vgl->local_value); if (vgl->chroma->plane_count == 3) {
vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[0], "Texture0"), 0); vgl->Uniform4fv(vgl->GetUniformLocation(vgl->program[0], "Coefficient"), 4, vgl->local_value);
vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[0], "Texture1"), 1); vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[0], "Texture0"), 0);
vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[0], "Texture2"), 2); vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[0], "Texture1"), 1);
vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[0], "Texture2"), 2);
}
else if (vgl->chroma->plane_count == 1) {
vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[0], "Texture0"), 0);
}
} else { } else {
vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[1], "Texture0"), 0); vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[1], "Texture0"), 0);
vgl->Uniform4f(vgl->GetUniformLocation(vgl->program[1], "FillColor"), 1.0f, 1.0f, 1.0f, 1.0f); vgl->Uniform4f(vgl->GetUniformLocation(vgl->program[1], "FillColor"), 1.0f, 1.0f, 1.0f, 1.0f);
...@@ -1000,7 +1005,7 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl, ...@@ -1000,7 +1005,7 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
} }
#ifdef SUPPORTS_SHADERS #ifdef SUPPORTS_SHADERS
if (vgl->program[0] && vgl->chroma->plane_count == 3) if (vgl->program[0] && (vgl->chroma->plane_count == 3 || vgl->chroma->plane_count == 1))
DrawWithShaders(vgl, left, top, right, bottom, 0); DrawWithShaders(vgl, left, top, right, bottom, 0);
else if (vgl->program[1] && vgl->chroma->plane_count == 1) else if (vgl->program[1] && vgl->chroma->plane_count == 1)
DrawWithShaders(vgl, left, top, right, bottom, 1); DrawWithShaders(vgl, left, top, right, bottom, 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment