diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-12-06 06:44:54 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-12-06 06:44:54 +0000 |
| commit | e70a7dde5ef4425560fbe3424d3f46e68e3a8854 (patch) | |
| tree | 948c7793f3dda1e0edf091e7aaeb4302d86111ed /libvo | |
| parent | 5daa1bf60f7e01331ff000cb31cbf67ae2f68a72 (diff) | |
| download | mpv-e70a7dde5ef4425560fbe3424d3f46e68e3a8854.tar.bz2 mpv-e70a7dde5ef4425560fbe3424d3f46e68e3a8854.tar.xz | |
More possible fixes for mesa-buffer mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28107 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_gl.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index f3aca7e1e1..c1c1d7357b 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -178,6 +178,7 @@ static void texSize(int w, int h, int *texw, int *texh) { *texh *= 2; } if (ati_hack) *texw = (*texw + 511) & ~511; + if (mesa_buffer) *texw = (*texw + 63) & ~63; } //! maximum size of custom fragment program @@ -702,7 +703,7 @@ static uint32_t get_image(mp_image_t *mpi) { mpi->width = texture_width; mpi->height = texture_height; } - if (mesa_buffer) mpi->width = (mpi->width + 63) & ~63; + if (mesa_buffer) mpi->width = texture_width; mpi->stride[0] = mpi->width * mpi->bpp / 8; needed_size = mpi->stride[0] * mpi->height; if (mesa_buffer) { @@ -794,8 +795,10 @@ static uint32_t draw_image(mp_image_t *mpi) { planes[0] = mpi->planes[0]; planes[1] = mpi->planes[1]; planes[2] = mpi->planes[2]; mpi_flipped = stride[0] < 0; if (mpi->flags & MP_IMGFLAG_DIRECT) { - if (mesa_buffer) glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, 1); - else { + if (mesa_buffer) { + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, 1); + w = texture_width; + } else { intptr_t base = (intptr_t)planes[0]; if (ati_hack) { w = texture_width; h = texture_height; } if (mpi_flipped) |