Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: S:/svn/mess/src/emu/video/pc_vga.c
- ===================================================================
- --- S:/svn/mess/src/emu/video/pc_vga.c (revision 15908)
- +++ S:/svn/mess/src/emu/video/pc_vga.c (working copy)
- @@ -261,6 +261,7 @@
- int pos, line, column, mask, w, h, addr;
- UINT8 blink_en,fore_col,back_col;
- pen_t pen;
- + const rectangle& visarea = machine.primary_screen->visible_area();
- if(vga.crtc.cursor_enable)
- vga.cursor.visible = machine.primary_screen->frame_number() & 0x10;
- @@ -294,7 +295,7 @@
- else
- pen = vga.pens[back_col];
- - if(!machine.primary_screen->visible_area().contains(column*width+w, line+h))
- + if(!visarea.contains(column*width+w, line+h))
- continue;
- bitmapline[column*width+w] = pen;
- @@ -307,7 +308,7 @@
- else
- pen = vga.pens[back_col];
- - if(!machine.primary_screen->visible_area().contains(column*width+w, line+h))
- + if(!visarea.contains(column*width+w, line+h))
- continue;
- bitmapline[column*width+w] = pen;
- }
- @@ -318,7 +319,7 @@
- (h<=vga.crtc.cursor_scan_end)&&(h<height)&&(line+h<TEXT_LINES);
- h++)
- {
- - if(!machine.primary_screen->visible_area().contains(column*width, line+h))
- + if(!visarea.contains(column*width, line+h))
- continue;
- bitmap.plot_box(column*width, line+h, width, 1, vga.pens[attr&0xf]);
- }
- @@ -333,6 +334,7 @@
- int height = vga.crtc.maximum_scan_line * (vga.crtc.scan_doubling + 1);
- UINT32 *bitmapline;
- pen_t pen;
- + const rectangle& visarea = machine.primary_screen->visible_area();
- /**/
- for (addr=EGA_START_ADDRESS, pos=0, line=0; line<LINES;
- @@ -354,7 +356,7 @@
- for (i = 7; i >= 0; i--)
- {
- pen = vga.pens[(data[0]&1) | (data[1]&2) | (data[2]&4) | (data[3]&8)];
- - if(!machine.primary_screen->visible_area().contains(c+i, line + yi))
- + if(!visarea.contains(c+i, line + yi))
- continue;
- bitmapline[c+i] = pen;
- @@ -378,6 +380,7 @@
- int yi;
- int xi;
- int pel_shift = 0;//vga.attribute.pel_shift; /* TODO: timing bug with this */
- + const rectangle& visarea = machine.primary_screen->visible_area();
- /* line compare is screen sensitive */
- mask_comp = 0x3ff; //| (LINES & 0x300);
- @@ -401,7 +404,7 @@
- for(xi=0;xi<8;xi++)
- {
- - if(!machine.primary_screen->visible_area().contains(c+xi-pel_shift, line + yi))
- + if(!visarea.contains(c+xi-pel_shift, line + yi))
- continue;
- bitmapline[c+xi-pel_shift] = machine.pens[vga.memory[(pos & 0xffff)+((xi >> 1)*0x10000)]];
- }
- @@ -428,7 +431,7 @@
- for(xi=0;xi<0x10;xi++)
- {
- - if(!machine.primary_screen->visible_area().contains(c+xi-pel_shift, line + yi))
- + if(!visarea.contains(c+xi-pel_shift, line + yi))
- continue;
- bitmapline[c+xi-pel_shift] = machine.pens[vga.memory[(pos+(xi >> 1)) & 0xffff]];
- }
- @@ -446,6 +449,7 @@
- UINT32 addr;
- pen_t pen;
- int width;
- + const rectangle& visarea = machine.primary_screen->visible_area();
- width = (vga.crtc.horz_disp_end + 1) * 8;
- @@ -462,7 +466,7 @@
- for(xi=0;xi<4;xi++)
- {
- pen = vga.pens[(vga.memory[addr] >> (6-xi*2)) & 3];
- - if(!machine.primary_screen->visible_area().contains(x+xi, y * height + yi))
- + if(!visarea.contains(x+xi, y * height + yi))
- continue;
- bitmapline[x+xi] = pen;
- }
- @@ -481,6 +485,7 @@
- UINT32 addr;
- pen_t pen;
- int width;
- + const rectangle& visarea = machine.primary_screen->visible_area();
- width = (vga.crtc.horz_disp_end + 1) * 8;
- @@ -497,7 +502,7 @@
- for(xi=0;xi<8;xi++)
- {
- pen = vga.pens[(vga.memory[addr] >> (7-xi)) & 1];
- - if(!machine.primary_screen->visible_area().contains(x+xi, y * height + yi))
- + if(!visarea.contains(x+xi, y * height + yi))
- continue;
- bitmapline[x+xi] = pen;
- }
- @@ -517,6 +522,7 @@
- int yi;
- int xi;
- UINT8 start_shift;
- + const rectangle& visarea = machine.primary_screen->visible_area();
- /* line compare is screen sensitive */
- mask_comp = 0x3ff;
- @@ -542,7 +548,7 @@
- for(xi=0;xi<8;xi++)
- {
- - if(!machine.primary_screen->visible_area().contains(c+xi, line + yi))
- + if(!visarea.contains(c+xi, line + yi))
- continue;
- bitmapline[c+xi] = machine.pens[vga.memory[(pos+(xi))]];
- }
- @@ -561,6 +567,7 @@
- int yi;
- int xm;
- int pos, line, column, c, addr, curr_addr;
- + const rectangle& visarea = machine.primary_screen->visible_area();
- UINT32 *bitmapline;
- // UINT16 mask_comp;
- @@ -581,7 +588,7 @@
- {
- int r,g,b;
- - if(!machine.primary_screen->visible_area().contains(c+xi, line + yi))
- + if(!visarea.contains(c+xi, line + yi))
- continue;
- r = (MV(pos+xm)&0x7c00)>>10;
- @@ -605,6 +612,7 @@
- int yi;
- int xm;
- int pos, line, column, c, addr, curr_addr;
- + const rectangle& visarea = machine.primary_screen->visible_area();
- UINT32 *bitmapline;
- // UINT16 mask_comp;
- @@ -625,7 +633,7 @@
- {
- int r,g,b;
- - if(!machine.primary_screen->visible_area().contains(c+xi, line + yi))
- + if(!visarea.contains(c+xi, line + yi))
- continue;
- r = (MV(pos+xm)&0xf800)>>11;
- @@ -650,6 +658,7 @@
- int xm;
- int pos, line, column, c, addr, curr_addr;
- UINT32 *bitmapline;
- + const rectangle& visarea = machine.primary_screen->visible_area();
- // UINT16 mask_comp;
- @@ -669,7 +678,7 @@
- {
- int r,g,b;
- - if(!machine.primary_screen->visible_area().contains(c+xi, line + yi))
- + if(!visarea.contains(c+xi, line + yi))
- continue;
- r = (MD(pos+xm)&0xff0000)>>16;
- @@ -691,6 +700,7 @@
- int xm;
- int pos, line, column, c, addr, curr_addr;
- UINT32 *bitmapline;
- + const rectangle& visarea = machine.primary_screen->visible_area();
- // UINT16 mask_comp;
- @@ -710,7 +720,7 @@
- {
- int r,g,b;
- - if(!machine.primary_screen->visible_area().contains(c+xi, line + yi))
- + if(!visarea.contains(c+xi, line + yi))
- continue;
- r = (MD(pos+xm)&0xff0000)>>16;
Add Comment
Please, Sign In to add comment