From: Ian Romanick Date: Fri, 4 Jun 2004 17:31:46 +0000 (+0000) Subject: Replace 'Display *' with '__DRInativeDisplay *'. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e3789ebe7ddd6fafdaaa38d7570173bd26d226f9;p=mesa.git Replace 'Display *' with '__DRInativeDisplay *'. --- diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.c b/src/mesa/drivers/dri/r200/r200_ioctl.c index 838a1dd5182..fcf396c1414 100644 --- a/src/mesa/drivers/dri/r200/r200_ioctl.c +++ b/src/mesa/drivers/dri/r200/r200_ioctl.c @@ -783,7 +783,7 @@ void r200Finish( GLcontext *ctx ) * device fd. */ #ifndef _SOLO -void *r200AllocateMemoryMESA(Display *dpy, int scrn, GLsizei size, +void *r200AllocateMemoryMESA(__DRInativeDisplay *dpy, int scrn, GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority) { @@ -828,7 +828,7 @@ void *r200AllocateMemoryMESA(Display *dpy, int scrn, GLsizei size, /* Called via glXFreeMemoryMESA() */ -void r200FreeMemoryMESA(Display *dpy, int scrn, GLvoid *pointer) +void r200FreeMemoryMESA(__DRInativeDisplay *dpy, int scrn, GLvoid *pointer) { GET_CURRENT_CONTEXT(ctx); r200ContextPtr rmesa; @@ -868,7 +868,7 @@ void r200FreeMemoryMESA(Display *dpy, int scrn, GLvoid *pointer) } /* Called via glXGetMemoryOffsetMESA() */ -GLuint r200GetMemoryOffsetMESA(Display *dpy, int scrn, const GLvoid *pointer) +GLuint r200GetMemoryOffsetMESA(__DRInativeDisplay *dpy, int scrn, const GLvoid *pointer) { GET_CURRENT_CONTEXT(ctx); r200ContextPtr rmesa; diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.h b/src/mesa/drivers/dri/r200/r200_ioctl.h index cb86aff7e60..9ad5eb3c096 100644 --- a/src/mesa/drivers/dri/r200/r200_ioctl.h +++ b/src/mesa/drivers/dri/r200/r200_ioctl.h @@ -107,10 +107,10 @@ extern void r200WaitForVBlank( r200ContextPtr rmesa ); extern void r200InitIoctlFuncs( struct dd_function_table *functions ); #ifndef _SOLO -extern void *r200AllocateMemoryMESA( Display *dpy, int scrn, GLsizei size, GLfloat readfreq, +extern void *r200AllocateMemoryMESA( __DRInativeDisplay *dpy, int scrn, GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority ); -extern void r200FreeMemoryMESA( Display *dpy, int scrn, GLvoid *pointer ); -extern GLuint r200GetMemoryOffsetMESA( Display *dpy, int scrn, const GLvoid *pointer ); +extern void r200FreeMemoryMESA( __DRInativeDisplay *dpy, int scrn, GLvoid *pointer ); +extern GLuint r200GetMemoryOffsetMESA( __DRInativeDisplay *dpy, int scrn, const GLvoid *pointer ); #endif extern GLboolean r200IsGartMemory( r200ContextPtr rmesa, const GLvoid *pointer, GLint size );