Re: [AD] changes in CVS

[Angelo Mottola <a.mottola@xxxxxxxxxx>]

> Let me know if there are any problems, which should be fixed.

Woops! The BITMAP constless patch was applied to the lib, but before xdga2.c
was included... so it has not be fixed. Here's another small quick diff that
solves the problem.
Also, I made a mistake in the allegro._tx file, so it doesn't compile to .info.
Again here's a small diff that solves this too.

Apart from these two things, the CVS lib compiled and works nicely, but now I
have both DGA 1 and DGA 2 on my gfx drivers list... However, DGA 1 now fails to
initialize, so there aren't problems after all, and GFX_AUTODETECT chooses DGA
2.

-- 
Angelo Mottola
a.mottola@xxxxxxxxxx

--- /usr/src/allegro_CVS/allegro.new/src/x/xdga2.c	Tue Sep 26 15:48:53 2000
+++ xdga2.c	Tue Sep 26 18:23:14 2000
@@ -46,16 +46,16 @@
 static void (*_orig_hline) (BITMAP *bmp, int x1, int y, int x2, int color);
 static void (*_orig_vline) (BITMAP *bmp, int x, int y1, int y2, int color);
 static void (*_orig_rectfill) (BITMAP *bmp, int x1, int y1, int x2, int y2, int color);
-static void (*_orig_draw_sprite) (BITMAP *bmp, AL_CONST BITMAP *sprite, int x, int y);
-static void (*_orig_masked_blit) (AL_CONST BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height);
+static void (*_orig_draw_sprite) (BITMAP *bmp, BITMAP *sprite, int x, int y);
+static void (*_orig_masked_blit) (BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height);
 
 static void _xaccel_hline(BITMAP *bmp, int x1, int y, int x2, int color);
 static void _xaccel_vline(BITMAP *bmp, int x, int y1, int y2, int color);
 static void _xaccel_rectfill(BITMAP *bmp, int x1, int y1, int x2, int y2, int color);
 static void _xaccel_clear_to_color(BITMAP *bmp, int color);
-static void _xaccel_blit_to_self(AL_CONST BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height);
-static void _xaccel_draw_sprite(BITMAP *bmp, AL_CONST BITMAP *sprite, int x, int y);
-static void _xaccel_masked_blit(AL_CONST BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height);
+static void _xaccel_blit_to_self(BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height);
+static void _xaccel_draw_sprite(BITMAP *bmp, BITMAP *sprite, int x, int y);
+static void _xaccel_masked_blit(BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height);
 
 
 
@@ -685,7 +685,7 @@
 /* _xaccel_blit_to_self:
  *  Accelerated vram -> vram blit.
  */
-static void _xaccel_blit_to_self(AL_CONST BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height)
+static void _xaccel_blit_to_self(BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height)
 {
    source_x += source->x_ofs;
    source_y += source->y_ofs;
@@ -702,7 +702,7 @@
 /* _xaccel_draw_sprite:
  *  Accelerated draw_sprite.
  */
-static void _xaccel_draw_sprite(BITMAP *bmp, AL_CONST BITMAP *sprite, int x, int y)
+static void _xaccel_draw_sprite(BITMAP *bmp, BITMAP *sprite, int x, int y)
 {
    int sx, sy, w, h;
 
@@ -749,7 +749,7 @@
 /* _xaccel_masked_blit:
  *  Accelerated masked_blit.
  */
-static void _xaccel_masked_blit(AL_CONST BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height)
+static void _xaccel_masked_blit(BITMAP *source, BITMAP *dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height)
 {
    source_x += source->x_ofs;
    source_y += source->y_ofs;

--- /usr/src/alleg/docs/allegro._tx	Tue Sep 26 15:06:45 2000
+++ allegro._tx	Tue Sep 26 18:52:29 2000
@@ -6812,7 +6812,6 @@
    GFX_XDFS<br>
       Like GFX_XDGA, but also changes the screen resolution so that it will 
       run fullscreen. This driver requires root permissions.
-</ul>
 <li>
    GFX_XDGA2<br>
       Use new DGA 2.0 extension provided by XFree86 4.0.x. This will work