summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authoriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-02-03 01:15:45 +0000
committeriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-02-03 01:15:45 +0000
commitcddb8271cbf2fc53c580f086082cb6b3b045590b (patch)
tree0885e4b63ce8454201e08f09189f066e56dfa79f /libvo
parent0316ffaa29657a8256bb94e56648886ae994d709 (diff)
downloadmpv-cddb8271cbf2fc53c580f086082cb6b3b045590b.tar.bz2
mpv-cddb8271cbf2fc53c580f086082cb6b3b045590b.tar.xz
disable auto oldmethod, directrendering for linear modes only
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9238 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_svga.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c
index e1a057b0a3..ae25882718 100644
--- a/libvo/vo_svga.c
+++ b/libvo/vo_svga.c
@@ -457,9 +457,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
return(1); // error
}
- if(vid_mode<10 || vid_mode==145) {
- oldmethod=1;
- }
/* set 332 palette for 8 bpp */
if(bpp==8){
int i;
@@ -478,9 +475,12 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
BYTESPERPIXEL=(bpp+4)>>3;
LINEWIDTH=vga_getmodeinfo(vid_mode)->linewidth;
- if(oldmethod && (bpp==8 || bpp==4)) LINEWIDTH*=8;
+ if( (vid_mode<10 || vid_mode==145) && (bpp==8 || bpp==4)) LINEWIDTH*=8;
+ else
+ if(vga_getmodeinfo(vid_mode)->flags & CAPABLE_LINEAR)
+// if (vga_version>0x1430)//remove this to get more speed (or black screen)
+ vga_setlinearaddressing();
- if(!oldmethod || (bpp>8))vga_setlinearaddressing();
if(oldmethod) {
buffer=malloc(HEIGHT*LINEWIDTH);
maxframes=0;
@@ -850,7 +850,8 @@ static uint32_t get_image(mp_image_t *mpi)
(mpi->height != image_height) */
)
return(VO_FALSE);
-
+ if(!directrender)
+ return (VO_FALSE);
/*
if (Flip_Flag)
{