Commit 26580f9e authored by Gleb Pinigin's avatar Gleb Pinigin Committed by Felix Paul Kühne

Use glEnable/glDisable with GL_TEXTURE_2D only for fixed pipeline(GLES 1.x)

Signed-off-by: Felix Paul Kühne's avatarFelix Paul Kühne <fkuehne@videolan.org>
parent 0b1ef649
...@@ -948,7 +948,6 @@ static void DrawWithShaders(vout_display_opengl_t *vgl, ...@@ -948,7 +948,6 @@ static void DrawWithShaders(vout_display_opengl_t *vgl,
}; };
glActiveTexture(GL_TEXTURE0+j); glActiveTexture(GL_TEXTURE0+j);
glClientActiveTexture(GL_TEXTURE0+j); glClientActiveTexture(GL_TEXTURE0+j);
glEnable(vgl->tex_target);
glBindTexture(vgl->tex_target, vgl->texture[0][j]); glBindTexture(vgl->tex_target, vgl->texture[0][j]);
char attribute[20]; char attribute[20];
...@@ -1022,7 +1021,9 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl, ...@@ -1022,7 +1021,9 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
#endif #endif
} }
#ifdef SUPPORTS_FIXED_PIPELINE
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
#endif
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
...@@ -1072,7 +1073,9 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl, ...@@ -1072,7 +1073,9 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
} }
} }
glDisable(GL_BLEND); glDisable(GL_BLEND);
#ifdef SUPPORTS_FIXED_PIPELINE
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
#endif
/* Display */ /* Display */
vlc_gl_Swap(vgl->gl); vlc_gl_Swap(vgl->gl);
......
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