ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Unix/video_x.cpp
(Generate patch)

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.77 by gbeauche, 2005-03-21T23:57:34Z vs.
Revision 1.78 by gbeauche, 2005-03-28T16:14:25Z

# Line 735 | Line 735 | driver_window::driver_window(X11_monitor
735          use_vosf = true;
736          // Allocate memory for frame buffer (SIZE is extended to page-boundary)
737          the_host_buffer = the_buffer_copy;
738 <        the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
738 >        the_host_buffer_row_bytes = img->bytes_per_line;
739 >        the_buffer_size = page_extend((aligned_height + 2) * the_host_buffer_row_bytes);
740          the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size);
741          the_buffer_copy = (uint8 *)malloc(the_buffer_size);
742          D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
# Line 1130 | Line 1131 | driver_fbdev::driver_fbdev(X11_monitor_d
1131          if (use_vosf) {
1132            // Allocate memory for frame buffer (SIZE is extended to page-boundary)
1133            the_host_buffer = the_buffer;
1134 <          the_buffer_size = page_extend((height + 2) * bytes_per_row);
1134 >          the_host_buffer_row_bytes = bytes_per_row;
1135 >          the_buffer_size = page_extend((height + 2) * the_host_buffer_row_bytes);
1136            the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1137            the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size);
1138          }
# Line 1270 | Line 1272 | driver_xf86dga::driver_xf86dga(X11_monit
1272          if (use_vosf) {
1273            // Allocate memory for frame buffer (SIZE is extended to page-boundary)
1274            the_host_buffer = the_buffer;
1275 <          the_buffer_size = page_extend((height + 2) * bytes_per_row);
1275 >          the_host_buffer_row_bytes = bytes_per_row;
1276 >          the_buffer_size = page_extend((height + 2) * the_host_buffer_row_bytes);
1277            the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1278            the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size);
1279          }
# Line 1412 | Line 1415 | bool X11_monitor_desc::video_open(void)
1415          }
1416  
1417          // Build up visualFormat structure
1418 +        visualFormat.fullscreen = (display_type == DISPLAY_DGA);
1419          visualFormat.depth = visualInfo.depth;
1420          visualFormat.Rmask = visualInfo.red_mask;
1421          visualFormat.Gmask = visualInfo.green_mask;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines