Mercurial > mplayer.hg

comparison libvo/vo_gl.c @ 28071:c7b912b0cbc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reindent
author reimar
date Sat, 06 Dec 2008 06:40:47 +0000
parents 9c1fdc6420be
children aea4c94e42a5
comparison
equal deleted inserted replaced
28070:9c1fdc6420be 28071:c7b912b0cbc2
795 planes[0] = mpi->planes[0]; planes[1] = mpi->planes[1]; planes[2] = mpi->planes[2]; 795 planes[0] = mpi->planes[0]; planes[1] = mpi->planes[1]; planes[2] = mpi->planes[2];
796 mpi_flipped = stride[0] < 0; 796 mpi_flipped = stride[0] < 0;
797 if (mpi->flags & MP_IMGFLAG_DIRECT) { 797 if (mpi->flags & MP_IMGFLAG_DIRECT) {
798 if (mesa_buffer) glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, 1); 798 if (mesa_buffer) glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, 1);
799 else { 799 else {
800 intptr_t base = (intptr_t)planes[0]; 800 intptr_t base = (intptr_t)planes[0];
801 if (mpi_flipped) 801 if (mpi_flipped)
802 base += (mpi->h - 1) * stride[0]; 802 base += (mpi->h - 1) * stride[0];
803 planes[0] -= base; 803 planes[0] -= base;
804 planes[1] -= base; 804 planes[1] -= base;
805 planes[2] -= base; 805 planes[2] -= base;
806 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer); 806 BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer);
807 UnmapBuffer(GL_PIXEL_UNPACK_BUFFER); 807 UnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
808 gl_bufferptr = NULL; 808 gl_bufferptr = NULL;
809 if (!(mpi->flags & MP_IMGFLAG_COMMON_PLANE)) 809 if (!(mpi->flags & MP_IMGFLAG_COMMON_PLANE))
810 planes[0] = planes[1] = planes[2] = NULL; 810 planes[0] = planes[1] = planes[2] = NULL;
811 } 811 }
812 slice = 0; // always "upload" full texture 812 slice = 0; // always "upload" full texture
813 } 813 }
814 glUploadTex(gl_target, gl_format, gl_type, planes[0], stride[0], 814 glUploadTex(gl_target, gl_format, gl_type, planes[0], stride[0],
815 mpi->x, mpi->y, w, h, slice); 815 mpi->x, mpi->y, w, h, slice);