DOS/Mesa driver updates (Daniel Borca)

3 files changed, 8 insertions, 13 deletions

diff --git a/src/mesa/drivers/dos/dmesa.c b/src/mesa/drivers/dos/dmesa.c
index d150cdca5ac..454b891c08b 100644
--- a/src/mesa/drivers/dos/dmesa.c
+++ b/src/mesa/drivers/dos/dmesa.c
@@ -540,13 +540,8 @@ static GLboolean set_draw_buffer (GLcontext *ctx, GLenum mode)
  * If anything special has to been done when the buffer/window is

  * resized, do it now.

  */

-static void get_buffer_size (GLframebuffer *buffer, GLuint *width, GLuint *height)

+static void get_buffer_size (GLcontext *ctx, GLuint *width, GLuint *height)

 {

- /* XXX this may not be right.  We should query the size of the DOS window

-  * associated with <buffer>.    This function should work whether or

-  * not there is a current context.

-  */

- GET_CURRENT_CONTEXT(ctx);

  DMesaContext c = (DMesaContext)ctx->DriverCtx;

 

  *width  = c->Buffer->width;

@@ -641,7 +636,7 @@ void dmesa_init_pointers (GLcontext *ctx)
  ctx->Driver.Accum = _swrast_Accum;

  ctx->Driver.Bitmap = _swrast_Bitmap;

  ctx->Driver.Clear = clear;

- ctx->Driver.ResizeBuffers = _swrast_alloc_buffers;

+ ctx->Driver.ResizeBuffersMESA = _swrast_alloc_buffers;

  ctx->Driver.CopyPixels = _swrast_CopyPixels;

  ctx->Driver.DrawPixels = _swrast_DrawPixels;

  ctx->Driver.ReadPixels = _swrast_ReadPixels;

diff --git a/src/mesa/drivers/dos/video.c b/src/mesa/drivers/dos/video.c
index 5c2c84a84f7..9d50952c527 100644
--- a/src/mesa/drivers/dos/video.c
+++ b/src/mesa/drivers/dos/video.c
@@ -23,7 +23,7 @@
  */

 

 /*

- * DOS/DJGPP device driver v0.3 for Mesa 4.0

+ * DOS/DJGPP device driver v0.4 for Mesa 4.0

  *

  *  Copyright (C) 2002 - Borca Daniel

  *  Email : [email protected]

@@ -180,9 +180,9 @@ void vl_rect (void *buffer, int x, int y, int width, int height, int color)
 /*

  * virtual dumping:

  */

-void *(*vl_flip) (void *buffer, int width, int height);

+void (*vl_flip) (void *buffer, int width, int height);

 

-extern void *b_dump_virtual (void *buffer, int width, int height);

+extern void b_dump_virtual (void *buffer, int width, int height);

 __asm__("\n\

 		.text				\n\

 		.balign	4			\n\

@@ -242,7 +242,7 @@ _b_dump_virtual:				\n\
 		popl	%esi			\n\

 		popl	%ebx			\n\

 		ret");

-extern void *l_dump_virtual (void *buffer, int width, int height);

+extern void l_dump_virtual (void *buffer, int width, int height);

 __asm__("\n\

 		.text				\n\

 		.balign	4			\n\

diff --git a/src/mesa/drivers/dos/video.h b/src/mesa/drivers/dos/video.h
index ff81ac9d2e9..c806aa7c885 100644
--- a/src/mesa/drivers/dos/video.h
+++ b/src/mesa/drivers/dos/video.h
@@ -23,7 +23,7 @@
  */

 

 /*

- * DOS/DJGPP device driver v0.3 for Mesa 4.0

+ * DOS/DJGPP device driver v0.4 for Mesa 4.0

  *

  *  Copyright (C) 2002 - Borca Daniel

  *  Email : [email protected]

@@ -42,7 +42,7 @@ void *vl_sync_buffer (void *buffer, int x, int y, int width, int height);
 extern void (*vl_clear) (void *buffer, int len, int color);

 void vl_rect (void *buffer, int x, int y, int width, int height, int color);

 

-void *(*vl_flip) (void *buffer, int width, int height);

+void (*vl_flip) (void *buffer, int width, int height);

 

 extern int (*vl_mixrgba) (const unsigned char rgba[]);

 extern int (*vl_mixrgb) (const unsigned char rgb[]);