Merge branch 'master' into experimental

2017-05-20 21:56:50 -05:00
parent 4b6684f459 bf47a5493a
commit 5a7a77cee5
10 changed files with 110 additions and 25 deletions
--- a/src/VIDEO/vid_svga.c
+++ b/src/VIDEO/vid_svga.c
@@ -1256,7 +1256,7 @@ uint8_t svga_read(uint32_t addr, void *p)
        if (svga->chain4 || svga->fb_only) 
        { 
                if (addr >= svga->vram_limit)
-                   return 0x00;
+                   return 0xff;
                return svga->vram[svga_mask_addr(addr, svga)];
        }
        else if (svga->chain2_read)
@@ -1274,7 +1274,7 @@ uint8_t svga_read(uint32_t addr, void *p)
                addr<<=2;

        if (addr >= svga->vram_limit)
-           return 0x00;
+           return 0xff;

 	addr = svga_mask_addr(addr, svga);