Skip to content

V
vlc-2-2
Commit e4602073 authored by Martin Storsjö's avatar Martin Storsjö
Browse files
Options

opengl: Make the ES1/ES2 video output work 

This mostly consists of ifdeffing out parts selectively from
opengl.c based on whether shaders or the fixed pipeline are
absent.

Both the ES1 and ES2 outputs have been tested on Ubuntu on
a pandaboard. They seem to mostly work fine, but overlay
subpictures seem garbled.
Signed-off-by: default avatarMartin Storsjö <martin@martin.st>
parent 4f6b2427
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 8 deletions
configure.ac
View file @ e4602073
...@@ -2897,10 +2897,10 @@ PKG_CHECK_MODULES([GL], [gl], [ ...@@ -2897,10 +2897,10 @@ PKG_CHECK_MODULES([GL], [gl], [
]) ])
]) ])
dnl OpenGL ES 2: depends on EGL 1.1 and is currently unfinished dnl OpenGL ES 2: depends on EGL 1.1
dnl PKG_ENABLE_MODULES_VLC([GLES2], [], [glesv2], [OpenGL ES v2 support], [auto]) PKG_ENABLE_MODULES_VLC([GLES2], [], [glesv2], [OpenGL ES v2 support], [auto])
dnl OpenGL ES 1: depends on EGL 1.0 and is currently broken dnl OpenGL ES 1: depends on EGL 1.0
dnl PKG_ENABLE_MODULES_VLC([GLES1], [], [glesv1_cm], [OpenGL ES v1 support], [auto]) PKG_ENABLE_MODULES_VLC([GLES1], [], [glesv1_cm], [OpenGL ES v1 support], [auto])
AC_ARG_ENABLE(egl, AC_ARG_ENABLE(egl,
[ --enable-egl OpenGL support through EGL (default disabled)],, [ [ --enable-egl OpenGL support through EGL (default disabled)],, [
......
modules/video_output/Modules.am
View file @ e4602073
...@@ -36,7 +36,7 @@ EXTRA_LTLIBRARIES += \ ...@@ -36,7 +36,7 @@ EXTRA_LTLIBRARIES += \
libgles1_plugin.la \ libgles1_plugin.la \
libgl_plugin.la libgl_plugin.la
libvlc_LTLIBRARIES += \ libvlc_LTLIBRARIES += \
$(LTLIBgl) $(LTLIBgles2) $(LTLIBgles1) $(LTLIBgl)
### XCB ### ### XCB ###
......
modules/video_output/gl.c
View file @ e4602073
...@@ -45,7 +45,6 @@ static void Close (vlc_object_t *); ...@@ -45,7 +45,6 @@ static void Close (vlc_object_t *);
vlc_module_begin () vlc_module_begin ()
#if USE_OPENGL_ES == 2 #if USE_OPENGL_ES == 2
# error The OpenGL ES2 plugin is incomplete and not functional. FIXME.
# define API VLC_OPENGL_ES2 # define API VLC_OPENGL_ES2
# define MODULE_VARNAME "gles2" # define MODULE_VARNAME "gles2"
set_shortname (N_("OpenGL ES2")) set_shortname (N_("OpenGL ES2"))
......
modules/video_output/opengl.c
View file @ e4602073
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
# define GL_CLAMP_TO_EDGE 0x812F # define GL_CLAMP_TO_EDGE 0x812F
#endif #endif
#ifdef __APPLE__ #if USE_OPENGL_ES == 2 || defined(__APPLE__)
# define PFNGLGETPROGRAMIVPROC typeof(glGetProgramiv)* # define PFNGLGETPROGRAMIVPROC typeof(glGetProgramiv)*
# define PFNGLGETPROGRAMINFOLOGPROC typeof(glGetProgramInfoLog)* # define PFNGLGETPROGRAMINFOLOGPROC typeof(glGetProgramInfoLog)*
# define PFNGLGETSHADERIVPROC typeof(glGetShaderiv)* # define PFNGLGETSHADERIVPROC typeof(glGetShaderiv)*
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
# define PFNGLUSEPROGRAMPROC typeof(glUseProgram)* # define PFNGLUSEPROGRAMPROC typeof(glUseProgram)*
# define PFNGLDELETEPROGRAMPROC typeof(glDeleteProgram)* # define PFNGLDELETEPROGRAMPROC typeof(glDeleteProgram)*
# define PFNGLATTACHSHADERPROC typeof(glAttachShader)* # define PFNGLATTACHSHADERPROC typeof(glAttachShader)*
#if USE_OPENGL_ES #if defined(__APPLE__) && USE_OPENGL_ES
# import <CoreFoundation/CoreFoundation.h> # import <CoreFoundation/CoreFoundation.h>
#endif #endif
#endif #endif
...@@ -71,11 +71,20 @@ ...@@ -71,11 +71,20 @@
# define VLCGL_TEXTURE_COUNT 1 # define VLCGL_TEXTURE_COUNT 1
# define VLCGL_PICTURE_MAX 1 # define VLCGL_PICTURE_MAX 1
# define PRECISION "precision highp float;" # define PRECISION "precision highp float;"
#if USE_OPENGL_ES == 2
# define SUPPORTS_SHADERS
# define glClientActiveTexture(x)
#else
# define SUPPORTS_FIXED_PIPELINE
# define GL_MAX_TEXTURE_IMAGE_UNITS GL_MAX_TEXTURE_UNITS
#endif
#else #else
# define GLSL_VERSION "120" # define GLSL_VERSION "120"
# define VLCGL_TEXTURE_COUNT 1 # define VLCGL_TEXTURE_COUNT 1
# define VLCGL_PICTURE_MAX 128 # define VLCGL_PICTURE_MAX 128
# define PRECISION "" # define PRECISION ""
# define SUPPORTS_SHADERS
# define SUPPORTS_FIXED_PIPELINE
#endif #endif
static const vlc_fourcc_t gl_subpicture_chromas[] = { static const vlc_fourcc_t gl_subpicture_chromas[] = {
...@@ -128,6 +137,7 @@ struct vout_display_opengl_t { ...@@ -128,6 +137,7 @@ struct vout_display_opengl_t {
GLfloat local_value[16]; GLfloat local_value[16];
/* Shader variables commands*/ /* Shader variables commands*/
#ifdef SUPPORTS_SHADERS
PFNGLGETUNIFORMLOCATIONPROC GetUniformLocation; PFNGLGETUNIFORMLOCATIONPROC GetUniformLocation;
PFNGLGETATTRIBLOCATIONPROC GetAttribLocation; PFNGLGETATTRIBLOCATIONPROC GetAttribLocation;
PFNGLVERTEXATTRIBPOINTERPROC VertexAttribPointer; PFNGLVERTEXATTRIBPOINTERPROC VertexAttribPointer;
...@@ -155,6 +165,7 @@ struct vout_display_opengl_t { ...@@ -155,6 +165,7 @@ struct vout_display_opengl_t {
PFNGLGETPROGRAMINFOLOGPROC GetProgramInfoLog; PFNGLGETPROGRAMINFOLOGPROC GetProgramInfoLog;
PFNGLGETSHADERIVPROC GetShaderiv; PFNGLGETSHADERIVPROC GetShaderiv;
PFNGLGETSHADERINFOLOGPROC GetShaderInfoLog; PFNGLGETSHADERINFOLOGPROC GetShaderInfoLog;
#endif
/* multitexture */ /* multitexture */
...@@ -189,6 +200,7 @@ static bool IsLuminance16Supported(int target) ...@@ -189,6 +200,7 @@ static bool IsLuminance16Supported(int target)
} }
#endif #endif
#ifdef SUPPORTS_SHADERS
static void BuildVertexShader(vout_display_opengl_t *vgl, static void BuildVertexShader(vout_display_opengl_t *vgl,
GLint *shader) GLint *shader)
{ {
...@@ -322,6 +334,7 @@ static void BuildRGBAFragmentShader(vout_display_opengl_t *vgl, ...@@ -322,6 +334,7 @@ static void BuildRGBAFragmentShader(vout_display_opengl_t *vgl,
vgl->ShaderSource(*shader, 1, &code, NULL); vgl->ShaderSource(*shader, 1, &code, NULL);
vgl->CompileShader(*shader); vgl->CompileShader(*shader);
} }
#endif
vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
const vlc_fourcc_t **subpicture_chromas, const vlc_fourcc_t **subpicture_chromas,
...@@ -351,6 +364,33 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, ...@@ -351,6 +364,33 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
bool supports_shaders = false; bool supports_shaders = false;
#endif #endif
#if USE_OPENGL_ES == 2
vgl->CreateShader = glCreateShader;
vgl->ShaderSource = glShaderSource;
vgl->CompileShader = glCompileShader;
vgl->AttachShader = glAttachShader;
vgl->GetProgramiv = glGetProgramiv;
vgl->GetShaderiv = glGetShaderiv;
vgl->GetProgramInfoLog = glGetProgramInfoLog;
vgl->GetShaderInfoLog = glGetShaderInfoLog;
vgl->DeleteShader = glDeleteShader;
vgl->GetUniformLocation = glGetUniformLocation;
vgl->GetAttribLocation = glGetAttribLocation;
vgl->VertexAttribPointer= glVertexAttribPointer;
vgl->EnableVertexAttribArray = glEnableVertexAttribArray;
vgl->Uniform4fv = glUniform4fv;
vgl->Uniform4f = glUniform4f;
vgl->Uniform1i = glUniform1i;
vgl->CreateProgram = glCreateProgram;
vgl->LinkProgram = glLinkProgram;
vgl->UseProgram = glUseProgram;
vgl->DeleteProgram = glDeleteProgram;
supports_shaders = true;
#elif defined(SUPPORTS_SHADERS)
vgl->CreateShader = (PFNGLCREATESHADERPROC)vlc_gl_GetProcAddress(vgl->gl, "glCreateShader"); vgl->CreateShader = (PFNGLCREATESHADERPROC)vlc_gl_GetProcAddress(vgl->gl, "glCreateShader");
vgl->ShaderSource = (PFNGLSHADERSOURCEPROC)vlc_gl_GetProcAddress(vgl->gl, "glShaderSource"); vgl->ShaderSource = (PFNGLSHADERSOURCEPROC)vlc_gl_GetProcAddress(vgl->gl, "glShaderSource");
vgl->CompileShader = (PFNGLCOMPILESHADERPROC)vlc_gl_GetProcAddress(vgl->gl, "glCompileShader"); vgl->CompileShader = (PFNGLCOMPILESHADERPROC)vlc_gl_GetProcAddress(vgl->gl, "glCompileShader");
...@@ -378,6 +418,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, ...@@ -378,6 +418,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
if (!vgl->CreateShader || !vgl->ShaderSource || !vgl->CreateProgram) if (!vgl->CreateShader || !vgl->ShaderSource || !vgl->CreateProgram)
supports_shaders = false; supports_shaders = false;
#endif
vgl->supports_npot = HasExtension(extensions, "GL_ARB_texture_non_power_of_two") || vgl->supports_npot = HasExtension(extensions, "GL_ARB_texture_non_power_of_two") ||
HasExtension(extensions, "GL_APPLE_texture_2D_limited_npot"); HasExtension(extensions, "GL_APPLE_texture_2D_limited_npot");
...@@ -474,6 +515,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, ...@@ -474,6 +515,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
vgl->shader[2] = -1; vgl->shader[2] = -1;
vgl->local_count = 0; vgl->local_count = 0;
if (supports_shaders && need_fs_yuv) { if (supports_shaders && need_fs_yuv) {
#ifdef SUPPORTS_SHADERS
BuildYUVFragmentShader(vgl, &vgl->shader[0], &vgl->local_count, BuildYUVFragmentShader(vgl, &vgl->shader[0], &vgl->local_count,
vgl->local_value, fmt, yuv_range_correction); vgl->local_value, fmt, yuv_range_correction);
BuildRGBAFragmentShader(vgl, &vgl->shader[1]); BuildRGBAFragmentShader(vgl, &vgl->shader[1]);
...@@ -524,6 +566,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, ...@@ -524,6 +566,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
return NULL; return NULL;
} }
} }
#endif
} }
/* */ /* */
...@@ -566,12 +609,14 @@ void vout_display_opengl_Delete(vout_display_opengl_t *vgl) ...@@ -566,12 +609,14 @@ void vout_display_opengl_Delete(vout_display_opengl_t *vgl)
} }
free(vgl->region); free(vgl->region);
#ifdef SUPPORTS_SHADERS
if (vgl->program[0]) { if (vgl->program[0]) {
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
vgl->DeleteProgram(vgl->program[i]); vgl->DeleteProgram(vgl->program[i]);
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
vgl->DeleteShader(vgl->shader[i]); vgl->DeleteShader(vgl->shader[i]);
} }
#endif
vlc_gl_Unlock(vgl->gl); vlc_gl_Unlock(vgl->gl);
} }
...@@ -788,6 +833,7 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl, ...@@ -788,6 +833,7 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
#ifdef SUPPORTS_FIXED_PIPELINE
static void DrawWithoutShaders(vout_display_opengl_t *vgl, static void DrawWithoutShaders(vout_display_opengl_t *vgl,
float *left, float *top, float *right, float *bottom) float *left, float *top, float *right, float *bottom)
{ {
...@@ -823,7 +869,9 @@ static void DrawWithoutShaders(vout_display_opengl_t *vgl, ...@@ -823,7 +869,9 @@ static void DrawWithoutShaders(vout_display_opengl_t *vgl,
glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_VERTEX_ARRAY);
glDisable(vgl->tex_target); glDisable(vgl->tex_target);
} }
#endif
#ifdef SUPPORTS_SHADERS
static void DrawWithShaders(vout_display_opengl_t *vgl, static void DrawWithShaders(vout_display_opengl_t *vgl,
float *left, float *top, float *right, float *bottom) float *left, float *top, float *right, float *bottom)
{ {
...@@ -864,6 +912,7 @@ static void DrawWithShaders(vout_display_opengl_t *vgl, ...@@ -864,6 +912,7 @@ static void DrawWithShaders(vout_display_opengl_t *vgl,
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
} }
#endif
int vout_display_opengl_Display(vout_display_opengl_t *vgl, int vout_display_opengl_Display(vout_display_opengl_t *vgl,
const video_format_t *source) const video_format_t *source)
...@@ -900,16 +949,24 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl, ...@@ -900,16 +949,24 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
bottom[j] = (source->i_y_offset + source->i_visible_height) * scale_h; bottom[j] = (source->i_y_offset + source->i_visible_height) * scale_h;
} }
#ifdef SUPPORTS_SHADERS
if (vgl->program[0]) if (vgl->program[0])
DrawWithShaders(vgl, left, top ,right, bottom); DrawWithShaders(vgl, left, top ,right, bottom);
else else
#endif
{
#ifdef SUPPORTS_FIXED_PIPELINE
DrawWithoutShaders(vgl, left, top, right, bottom); DrawWithoutShaders(vgl, left, top, right, bottom);
#endif
}
/* Draw the subpictures */ /* Draw the subpictures */
if (vgl->program[1]) { if (vgl->program[1]) {
#ifdef SUPPORTS_SHADERS
// Change the program for overlays // Change the program for overlays
vgl->UseProgram(vgl->program[1]); vgl->UseProgram(vgl->program[1]);
vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[1], "Texture"), 0); vgl->Uniform1i(vgl->GetUniformLocation(vgl->program[1], "Texture"), 0);
#endif
} }
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
...@@ -935,24 +992,30 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl, ...@@ -935,24 +992,30 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
glBindTexture(GL_TEXTURE_2D, glr->texture); glBindTexture(GL_TEXTURE_2D, glr->texture);
if (vgl->program[1]) { if (vgl->program[1]) {
#ifdef SUPPORTS_SHADERS
vgl->Uniform4f(vgl->GetUniformLocation(vgl->program[1], "FillColor"), 1.0f, 1.0f, 1.0f, glr->alpha); vgl->Uniform4f(vgl->GetUniformLocation(vgl->program[1], "FillColor"), 1.0f, 1.0f, 1.0f, glr->alpha);
vgl->EnableVertexAttribArray(vgl->GetAttribLocation(vgl->program[1], "MultiTexCoord0")); vgl->EnableVertexAttribArray(vgl->GetAttribLocation(vgl->program[1], "MultiTexCoord0"));
vgl->VertexAttribPointer(vgl->GetAttribLocation(vgl->program[1], "MultiTexCoord0"), 2, GL_FLOAT, 0, 0, textureCoord); vgl->VertexAttribPointer(vgl->GetAttribLocation(vgl->program[1], "MultiTexCoord0"), 2, GL_FLOAT, 0, 0, textureCoord);
vgl->EnableVertexAttribArray(vgl->GetAttribLocation(vgl->program[1], "VertexPosition")); vgl->EnableVertexAttribArray(vgl->GetAttribLocation(vgl->program[1], "VertexPosition"));
vgl->VertexAttribPointer(vgl->GetAttribLocation(vgl->program[1], "VertexPosition"), 2, GL_FLOAT, 0, 0, vertexCoord); vgl->VertexAttribPointer(vgl->GetAttribLocation(vgl->program[1], "VertexPosition"), 2, GL_FLOAT, 0, 0, vertexCoord);
#endif
} else { } else {
#ifdef SUPPORTS_FIXED_PIPELINE
glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_TEXTURE_COORD_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glColor4f(1.0f, 1.0f, 1.0f, glr->alpha); glColor4f(1.0f, 1.0f, 1.0f, glr->alpha);
glTexCoordPointer(2, GL_FLOAT, 0, textureCoord); glTexCoordPointer(2, GL_FLOAT, 0, textureCoord);
glVertexPointer(2, GL_FLOAT, 0, vertexCoord); glVertexPointer(2, GL_FLOAT, 0, vertexCoord);
#endif
} }
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
if (!vgl->program[1]) { if (!vgl->program[1]) {
#ifdef SUPPORTS_FIXED_PIPELINE
glDisableClientState(GL_TEXTURE_COORD_ARRAY); glDisableClientState(GL_TEXTURE_COORD_ARRAY);
glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_VERTEX_ARRAY);
#endif
} }
} }
glDisable(GL_BLEND); glDisable(GL_BLEND);
......
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