comparison libvo/vo_svga.c @ 9046:13b7ad16f278

This patch should fix the display problem with 4bpp and 8bpp modes. The problem was that the new drawing method assumes a linear framebuffer, which is not available in those modes. This can be worked around by using the old drawing method, which is what this patch does. The old method can be forced, by using the "old" driver option. This patch also enables linear addressing, since it improves write speed to video memory considerably. The mentioned problem: "it is not compatable with vga_draw* for some cards" Is a bug in svgalib, which I think should be fixed in recent svgalib versions. If someone sees this problem, please report to svgalib maintainer (that's me). patch by Matan Ziv-Av. [e-mail]

9045:417a20a4fc75

    printf("vo_svga: vga_setmode(%d) failed.\n",vid_mode);
    uninit();
    return(1); // error
  }
  
  /* set 332 palette for 8 bpp */
  if(bpp==8){
    int i;
    for(i=0; i<256; i++)
      vga_setpalette(i, ((i>>5)&7)*9, ((i>>2)&7)*9, (i&3)*21);

  }

  WIDTH=vga_getxdim();
  HEIGHT=vga_getydim();
  BYTESPERPIXEL=(bpp+4)>>3;
  if(bpp==1)
    LINEWIDTH=(WIDTH+7)/8;
  else
    LINEWIDTH=vga_getmodeinfo(vid_mode)->linewidth;

//  vga_setlinearaddressing(); //it is not compatable with vga_draw* for "some" cards
  if(oldmethod) {
     buffer=malloc(HEIGHT*LINEWIDTH);
     maxframes=0;
  } else if ((vga_getmodeinfo(vid_mode)->flags&IS_LINEAR)) {
  	directrender=1;

9046:13b7ad16f278

    printf("vo_svga: vga_setmode(%d) failed.\n",vid_mode);
    uninit();
    return(1); // error
  }
  
  if(vid_mode<10 || vid_mode==145) {
  	oldmethod=1;
  }
  /* set 332 palette for 8 bpp */
  if(bpp==8){
    int i;
    for(i=0; i<256; i++)
      vga_setpalette(i, ((i>>5)&7)*9, ((i>>2)&7)*9, (i&3)*21);

  }

  WIDTH=vga_getxdim();
  HEIGHT=vga_getydim();
  BYTESPERPIXEL=(bpp+4)>>3;
    LINEWIDTH=vga_getmodeinfo(vid_mode)->linewidth;

  if(oldmethod && (bpp==8 || bpp==4)) LINEWIDTH*=8;
  
  if(!oldmethod || (bpp>8))vga_setlinearaddressing();
  if(oldmethod) {
     buffer=malloc(HEIGHT*LINEWIDTH);
     maxframes=0;
  } else if ((vga_getmodeinfo(vid_mode)->flags&IS_LINEAR)) {
  	directrender=1;