Mesa (master): r200: get rid of old gart memory functions from old dri1
Roland Scheidegger
sroland at kemper.freedesktop.org
Wed Aug 1 12:55:58 UTC 2012
Module: Mesa
Branch: master
Commit: 549470aa1a0149795b17bb81d98d70a57abb70ef
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=549470aa1a0149795b17bb81d98d70a57abb70ef
Author: Roland Scheidegger <sroland at vmware.com>
Date: Fri Jul 27 03:46:41 2012 +0200
r200: get rid of old gart memory functions from old dri1
Those functions are SO dead.
---
src/mesa/drivers/dri/r200/r200_ioctl.c | 26 --------------------------
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 faa9f16..9a73961 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 02a06a3..9aa00de 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 );
/* ================================================================
More information about the mesa-commit
mailing list