Added _mesa_lookup_program() and _mesa_lookup_bufferobj() functions to avoid

a lot of casting elsewhere.
Use _mesa_lookup_texture() in tdfx driver, use _mesa_lookup_bufferobj() in r300
driver.

3 files changed, 11 insertions, 10 deletions

diff --git a/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c b/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c
index a7db8dae63..d3a4bfcd2f 100644
--- a/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c
+++ b/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c
@@ -749,13 +749,13 @@ void r300_evict_vbos(GLcontext *ctx, int amount)
 	r300ContextPtr rmesa = R300_CONTEXT(ctx);
 	struct _mesa_HashTable *hash = ctx->Shared->BufferObjects;
 	GLuint k = _mesa_HashFirstEntry(hash);
-	struct gl_buffer_object *obj;
 	struct r300_buffer_object *r300_obj;
 	GLvoid *data;
 	
 	while (amount > 0 && k) {
-		obj = (struct gl_buffer_object *) _mesa_HashLookup(hash, k);
-		r300_obj = (struct r300_buffer_object *) obj;
+		struct gl_buffer_object *obj = _mesa_lookup_bufferobj(ctx, k);
+		struct r300_buffer_object *r300_obj
+			= (struct r300_buffer_object *) obj;
 		
 		if (obj->OnCard && obj->Size) {
 			obj->Data = _mesa_malloc(obj->Size);
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.c b/src/mesa/drivers/dri/tdfx/tdfx_context.c
index 826a9f71df..8d8a629474 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.c
@@ -602,7 +602,7 @@ tdfxDestroyContext( __DRIcontextPrivate *driContextPriv )
               id;
               id = _mesa_HashNextEntry(textures, id)) {
             struct gl_texture_object *tObj
-               = (struct gl_texture_object *) _mesa_HashLookup(textures, id);
+               = _mesa_lookup_texture(fxMesa->glCtx, id);
             tdfxTMFreeTexture(fxMesa, tObj);
          }
       }
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_texman.c b/src/mesa/drivers/dri/tdfx/tdfx_texman.c
index 63cae17e4e..6f782f687f 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_texman.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_texman.c
@@ -38,6 +38,7 @@
 #include "tdfx_context.h"
 #include "tdfx_tex.h"
 #include "tdfx_texman.h"
+#include "texobj.h"
 #include "hash.h"
 
 
@@ -82,8 +83,8 @@ VerifyFreeList(tdfxContextPtr fxMesa, FxU32 tmu)
        for (id = _mesa_HashFirstEntry(textures);
             id;
             id = _mesa_HashNextEntry(textures, id)) {
-          struct gl_texture_object *tObj;
-          tObj = (struct gl_texture_object *) _mesa_HashLookup(textures, id);
+          struct gl_texture_object *tObj
+             = _mesa_lookup_texture(fxMesa->glCtx, id);
           tdfxTexInfo *ti = TDFX_TEXTURE_DATA(tObj);
           if (ti) {
              if (ti->isInTM) {
@@ -122,7 +123,7 @@ dump_texmem(tdfxContextPtr fxMesa)
          id;
          id = _mesa_HashNextEntry(textures, id)) {
         struct gl_texture_object *obj
-            = (struct gl_texture_object *) _mesa_HashLookup(textures, id);
+           = _mesa_lookup_texture(fxMesa->glCtx, id);
         tdfxTexInfo *info = TDFX_TEXTURE_DATA(obj);
 
         if (info && info->isInTM) {
@@ -404,7 +405,7 @@ FindOldestObject(tdfxContextPtr fxMesa, FxU32 tmu)
          id;
          id = _mesa_HashNextEntry(textures, id)) {
         struct gl_texture_object *obj
-            = (struct gl_texture_object *) _mesa_HashLookup(textures, id);
+           = _mesa_lookup_texture(fxMesa->glCtx, id);
         tdfxTexInfo *info = TDFX_TEXTURE_DATA(obj);
 
         if (info && info->isInTM &&
@@ -460,7 +461,7 @@ FlushTexMemory(tdfxContextPtr fxMesa)
          id;
          id = _mesa_HashNextEntry(textures, id)) {
        struct gl_texture_object *obj
-          = (struct gl_texture_object *) _mesa_HashLookup(textures, id);
+          = _mesa_lookup_texture(fxMesa->glCtx, id);
        if (obj->RefCount < 2) {
           /* don't flush currently bound textures */
           tdfxTMMoveOutTM_NoLock(fxMesa, obj);
@@ -972,7 +973,7 @@ void tdfxTMRestoreTextures_NoLock( tdfxContextPtr fxMesa )
         id;
         id = _mesa_HashNextEntry(textures, id)) {
       struct gl_texture_object *tObj
-         = (struct gl_texture_object *) _mesa_HashLookup(textures, id);
+         = _mesa_lookup_texture(fxMesa->glCtx, id);
       tdfxTexInfo *ti = TDFX_TEXTURE_DATA( tObj );
       if ( ti && ti->isInTM ) {
          int i;