r36223 - in trunk/libvo: gl_common.c gl_common.h matrixview.c vo_gl.c vo_gl_tiled.c
Author: reimar Date: Sat May 4 17:20:45 2013 New Revision: 36223 Log: Remove glMatrixMode and glLoadIdentity functions. They are not really necessary. Modified: trunk/libvo/gl_common.c trunk/libvo/gl_common.h trunk/libvo/matrixview.c trunk/libvo/vo_gl.c trunk/libvo/vo_gl_tiled.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sat May 4 17:20:43 2013 (r36222) +++ trunk/libvo/gl_common.c Sat May 4 17:20:45 2013 (r36223) @@ -48,8 +48,6 @@ GLenum (GLAPIENTRY *mpglGetError)(void); void (GLAPIENTRY *mpglBegin)(GLenum); void (GLAPIENTRY *mpglEnd)(void); void (GLAPIENTRY *mpglViewport)(GLint, GLint, GLsizei, GLsizei); -void (GLAPIENTRY *mpglMatrixMode)(GLenum); -void (GLAPIENTRY *mpglLoadIdentity)(void); void (GLAPIENTRY *mpglLoadMatrixf)(const float *); void (GLAPIENTRY *mpglClear)(GLbitfield); GLuint (GLAPIENTRY *mpglGenLists)(GLsizei); @@ -443,8 +441,6 @@ static const extfunc_desc_t extfuncs[] = DEF_FUNC_DESC(Begin), DEF_FUNC_DESC(End), DEF_FUNC_DESC(Viewport), - DEF_FUNC_DESC(MatrixMode), - DEF_FUNC_DESC(LoadIdentity), DEF_FUNC_DESC(LoadMatrixf), DEF_FUNC_DESC(Clear), DEF_FUNC_DESC(GenLists), Modified: trunk/libvo/gl_common.h ============================================================================== --- trunk/libvo/gl_common.h Sat May 4 17:20:43 2013 (r36222) +++ trunk/libvo/gl_common.h Sat May 4 17:20:45 2013 (r36223) @@ -237,8 +237,6 @@ extern GLenum (GLAPIENTRY *mpglGetError) extern void (GLAPIENTRY *mpglBegin)(GLenum); extern void (GLAPIENTRY *mpglEnd)(void); extern void (GLAPIENTRY *mpglViewport)(GLint, GLint, GLsizei, GLsizei); -extern void (GLAPIENTRY *mpglMatrixMode)(GLenum); -extern void (GLAPIENTRY *mpglLoadIdentity)(void); extern void (GLAPIENTRY *mpglLoadMatrixf)(const float *); extern void (GLAPIENTRY *mpglClear)(GLbitfield); extern GLuint (GLAPIENTRY *mpglGenLists)(GLsizei); Modified: trunk/libvo/matrixview.c ============================================================================== --- trunk/libvo/matrixview.c Sat May 4 17:20:43 2013 (r36222) +++ trunk/libvo/matrixview.c Sat May 4 17:20:45 2013 (r36223) @@ -322,11 +322,7 @@ void matrixview_reshape(int w, int h) }; mpglViewport(0, 0, w, h); - mpglMatrixMode(GL_PROJECTION); mpglLoadMatrixf(matrix); - - mpglMatrixMode(GL_MODELVIEW); - mpglLoadIdentity(); } Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Sat May 4 17:20:43 2013 (r36222) +++ trunk/libvo/vo_gl.c Sat May 4 17:20:45 2013 (r36223) @@ -194,7 +194,6 @@ static void resize(int x,int y){ } else mpglViewport( 0, 0, x, y ); - mpglMatrixMode(GL_PROJECTION); ass_border_x = ass_border_y = 0; if (aspect_scaling() && use_aspect) { int new_w, new_h; @@ -214,9 +213,6 @@ static void resize(int x,int y){ } mpglLoadMatrixf(video_matrix); - mpglMatrixMode(GL_MODELVIEW); - mpglLoadIdentity(); - if (!scaled_osd) { #ifdef CONFIG_FREETYPE // adjust font size to display size @@ -843,7 +839,6 @@ static void do_render_osd(int type) { 0, 0, 0, 0, -1, 1, 0, 1 }; - mpglMatrixMode(GL_PROJECTION); mpglLoadMatrixf(matrix); } mpglEnable(GL_BLEND); Modified: trunk/libvo/vo_gl_tiled.c ============================================================================== --- trunk/libvo/vo_gl_tiled.c Sat May 4 17:20:43 2013 (r36222) +++ trunk/libvo/vo_gl_tiled.c Sat May 4 17:20:45 2013 (r36223) @@ -446,11 +446,7 @@ static void resize(int x,int y){ glViewport( 0, 0, x, y ); } - glMatrixMode(GL_PROJECTION); glLoadMatrixf(matrix); - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); } static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
participants (1)
-
reimar