Skip to content

V
vlc-2-2
Commit 46d64803 authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

remove few #if OPENGL_ES

parent 3cad191c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
modules/video_output/opengl.c
View file @ 46d64803
...@@ -672,6 +672,7 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl, ...@@ -672,6 +672,7 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
glDisableClientState(GL_TEXTURE_COORD_ARRAY); glDisableClientState(GL_TEXTURE_COORD_ARRAY);
glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_VERTEX_ARRAY);
glDisable(vgl->tex_target);
#else #else
const GLfloat vertexCoord[] = { const GLfloat vertexCoord[] = {
...@@ -708,14 +709,12 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl, ...@@ -708,14 +709,12 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
} }
#endif
if (vgl->program) if (vgl->program)
glDisable(GL_FRAGMENT_PROGRAM_ARB); glDisable(GL_FRAGMENT_PROGRAM_ARB);
else else
glDisable(vgl->tex_target); glDisable(vgl->tex_target);
#if !USE_OPENGL_ES
if (vgl->use_multitexture) if (vgl->use_multitexture)
vgl->ActiveTextureARB(GL_TEXTURE0_ARB + 0); vgl->ActiveTextureARB(GL_TEXTURE0_ARB + 0);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
......
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