Replace 'Display *' with '__DRInativeDisplay *'.

This commit is contained in:
Ian Romanick 2004-06-04 17:31:46 +00:00
parent 98e7d810e1
commit e3789ebe7d
2 changed files with 6 additions and 6 deletions

View File

@ -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;

View File

@ -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 );