RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed UNPACK_ALIGNMENT setting. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13576 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2004-10-06 16:48:19 +00:00
parent 7663ab4a07
commit 4131acb7ff
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libvo/vo_gl.c
View File

@ -248,6 +248,17 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
// set alignment as default is 4 which will break some files
if ((image_width * image_bytes) % 8 == 0)
gl_alignment=8;
else if ((image_width * image_bytes) % 4 == 0)
gl_alignment=4;
else if ((image_width * image_bytes) % 2 == 0)
gl_alignment=2;
else
gl_alignment=1;
glPixelStorei (GL_UNPACK_ALIGNMENT, gl_alignment);
mp_msg(MSGT_VO, MSGL_V, "[gl] Creating %dx%d texture...\n",texture_width,texture_height); mp_msg(MSGT_VO, MSGL_V, "[gl] Creating %dx%d texture...\n",texture_width,texture_height);
#if 1 #if 1

7
libvo/vo_gl2.c
View File

@ -819,12 +819,13 @@ static int initGl(uint32_t d_width, uint32_t d_height)
/** /**
* may give a little speed up for a kinda burst read .. * may give a little speed up for a kinda burst read ..
* Also, the default of 4 will break some files.
*/ */
if( (image_width*image_bpp)%8 == 0 ) if( (image_width*image_bytes)%8 == 0 )
gl_alignment=8; gl_alignment=8;
else if( (image_width*image_bpp)%4 == 0 ) else if( (image_width*image_bytes)%4 == 0 )
gl_alignment=4; gl_alignment=4;
else if( (image_width*image_bpp)%2 == 0 ) else if( (image_width*image_bytes)%2 == 0 )
gl_alignment=2; gl_alignment=2;
else else
gl_alignment=1; gl_alignment=1;