From bfaca5c64907c78589ed41a2e6bd11c7c7f5640a Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Tue, 13 Apr 2004 09:43:51 +0000 Subject: fix the usage of GLX_MESA_allocate_memory --- src/mesa/drivers/dri/r200/r200_ioctl.c | 6 +++--- src/mesa/drivers/dri/r200/r200_ioctl.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.c b/src/mesa/drivers/dri/r200/r200_ioctl.c index 0a38da2d60..edb6079d7e 100644 --- a/src/mesa/drivers/dri/r200/r200_ioctl.c +++ b/src/mesa/drivers/dri/r200/r200_ioctl.c @@ -782,7 +782,7 @@ void r200Finish( GLcontext *ctx ) * the kernel data structures, and the current context to get the * device fd. */ -void *r200AllocateMemoryMESA(GLsizei size, +void *r200AllocateMemoryMESA(Display *dpy, int scrn, GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority) { @@ -827,7 +827,7 @@ void *r200AllocateMemoryMESA(GLsizei size, /* Called via glXFreeMemoryMESA() */ -void r200FreeMemoryMESA(GLvoid *pointer) +void r200FreeMemoryMESA(Display *dpy, int scrn, GLvoid *pointer) { GET_CURRENT_CONTEXT(ctx); r200ContextPtr rmesa; @@ -867,7 +867,7 @@ void r200FreeMemoryMESA(GLvoid *pointer) } /* Called via glXGetMemoryOffsetMESA() */ -GLuint r200GetMemoryOffsetMESA(const GLvoid *pointer) +GLuint r200GetMemoryOffsetMESA(Display *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 0679194603..9684d9682c 100644 --- a/src/mesa/drivers/dri/r200/r200_ioctl.h +++ b/src/mesa/drivers/dri/r200/r200_ioctl.h @@ -106,10 +106,10 @@ extern void r200WaitForIdleLocked( r200ContextPtr rmesa ); extern void r200WaitForVBlank( r200ContextPtr rmesa ); extern void r200InitIoctlFuncs( struct dd_function_table *functions ); -extern void *r200AllocateMemoryMESA( GLsizei size, GLfloat readfreq, +extern void *r200AllocateMemoryMESA( Display *dpy, int scrn, GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority ); -extern void r200FreeMemoryMESA( GLvoid *pointer ); -extern GLuint r200GetMemoryOffsetMESA( const GLvoid *pointer ); +extern void r200FreeMemoryMESA( Display *dpy, int scrn, GLvoid *pointer ); +extern GLuint r200GetMemoryOffsetMESA( Display *dpy, int scrn, const GLvoid *pointer ); extern GLboolean r200IsGartMemory( r200ContextPtr rmesa, const GLvoid *pointer, GLint size ); -- cgit v1.2.3