diff options
| author | Roland Scheidegger <[email protected]> | 2012-07-27 03:46:41 +0200 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2012-08-01 14:58:29 +0200 |
| commit | 549470aa1a0149795b17bb81d98d70a57abb70ef (patch) | |
| tree | 58c9c9d2078f2cb1267a802459d0166abdfb5a7a | |
| parent | de694b6b10b7ce23a00cd7296a955f162704ee62 (diff) | |
r200: get rid of old gart memory functions from old dri1
Those functions are SO dead.
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_ioctl.c | 26 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_ioctl.h | 6 |
2 files changed, 0 insertions, 32 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.c b/src/mesa/drivers/dri/r200/r200_ioctl.c index faa9f16a376..9a73961e666 100644 --- a/src/mesa/drivers/dri/r200/r200_ioctl.c +++ b/src/mesa/drivers/dri/r200/r200_ioctl.c @@ -86,32 +86,6 @@ static void r200Clear( struct gl_context *ctx, GLbitfield mask ) radeonUserClear(ctx, hwmask); } -GLboolean r200IsGartMemory( r200ContextPtr rmesa, const GLvoid *pointer, - GLint size ) -{ - ptrdiff_t offset = (char *)pointer - (char *)rmesa->radeon.radeonScreen->gartTextures.map; - int valid = (size >= 0 && - offset >= 0 && - offset + size < rmesa->radeon.radeonScreen->gartTextures.size); - - if (R200_DEBUG & RADEON_IOCTL) - fprintf(stderr, "r200IsGartMemory( %p ) : %d\n", pointer, valid ); - - return valid; -} - - -GLuint r200GartOffsetFromVirtual( r200ContextPtr rmesa, const GLvoid *pointer ) -{ - ptrdiff_t offset = (char *)pointer - (char *)rmesa->radeon.radeonScreen->gartTextures.map; - - if (offset < 0 || offset > rmesa->radeon.radeonScreen->gartTextures.size) - return ~0; - else - return rmesa->radeon.radeonScreen->gart_texture_offset + offset; -} - - void r200InitIoctlFuncs( struct dd_function_table *functions ) { diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.h b/src/mesa/drivers/dri/r200/r200_ioctl.h index 02a06a32b42..9aa00deb4e1 100644 --- a/src/mesa/drivers/dri/r200/r200_ioctl.h +++ b/src/mesa/drivers/dri/r200/r200_ioctl.h @@ -65,12 +65,6 @@ extern void r200EmitAOS(r200ContextPtr rmesa, GLuint nr, GLuint offset); extern void r200InitIoctlFuncs( struct dd_function_table *functions ); -extern GLboolean r200IsGartMemory( r200ContextPtr rmesa, const GLvoid *pointer, - GLint size ); - -extern GLuint r200GartOffsetFromVirtual( r200ContextPtr rmesa, - const GLvoid *pointer ); - void r200SetUpAtomList( r200ContextPtr rmesa ); /* ================================================================ |