diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2005-11-28 13:17:15 +0000 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2005-11-28 13:17:15 +0000 |
commit | 2b8e66d210c333c1f9bdb4e2de079798f1c810f1 (patch) | |
tree | f3fb268b318353dfcbbca986d2d42dec189938de /src/mesa/drivers | |
parent | aae2b8b8eba46594d0915725c57f45d2965b15d6 (diff) |
Remove the many aliases for 'struct mem_block' in mm.h
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r-- | src/mesa/drivers/dri/common/texmem.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/common/texmem.h | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/gamma/gamma_context.h | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/mach64/mach64_context.h | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/s3v/s3v_context.h | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/trident/trident_context.h | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/common/texmem.c b/src/mesa/drivers/dri/common/texmem.c index c3f6ec9baea..7cf2e21b633 100644 --- a/src/mesa/drivers/dri/common/texmem.c +++ b/src/mesa/drivers/dri/common/texmem.c @@ -1138,7 +1138,7 @@ driValidateTextureHeaps( driTexHeap * const * texture_heaps, unsigned textures_in_heap = 0; unsigned blocks_in_mempool = 0; const driTexHeap * heap = texture_heaps[i]; - const memHeap_t * p = heap->memory_heap; + const struct mem_block *p = heap->memory_heap; /* Check each texture object has a MemBlock, and is linked into * the correct heap. diff --git a/src/mesa/drivers/dri/common/texmem.h b/src/mesa/drivers/dri/common/texmem.h index 5c1fc323843..22d1755895e 100644 --- a/src/mesa/drivers/dri/common/texmem.h +++ b/src/mesa/drivers/dri/common/texmem.h @@ -66,7 +66,7 @@ struct dri_texture_object { * texture memory in use by another context. * A placeholder should have a heap and a memBlock. */ - PMemBlock memBlock; /**< Memory block containing texture */ + struct mem_block *memBlock; /**< Memory block containing texture */ unsigned reserved; /**< Cannot be swapped out by user contexts. */ @@ -176,7 +176,7 @@ struct dri_tex_heap { /** Memory heap used to manage texture memory represented by * this texture heap. */ - memHeap_t * memory_heap; + struct mem_block * memory_heap; /** List of objects that we currently believe to be in texture * memory. diff --git a/src/mesa/drivers/dri/gamma/gamma_context.h b/src/mesa/drivers/dri/gamma/gamma_context.h index 7745f4c3c3d..f0ab1c4f05c 100644 --- a/src/mesa/drivers/dri/gamma/gamma_context.h +++ b/src/mesa/drivers/dri/gamma/gamma_context.h @@ -144,7 +144,7 @@ struct gamma_texture_object_t { int totalSize; int bound; - PMemBlock MemBlock; + struct mem_block *MemBlock; char * BufAddr; GLuint min_level; @@ -291,7 +291,7 @@ struct gamma_context { struct gamma_texture_object_t SwappedOut; GLenum TexEnvImageFmt[2]; - memHeap_t *texHeap; + struct mem_block *texHeap; unsigned int lastSwap; int texAge; diff --git a/src/mesa/drivers/dri/mach64/mach64_context.h b/src/mesa/drivers/dri/mach64/mach64_context.h index c541f77ab98..e718b96c188 100644 --- a/src/mesa/drivers/dri/mach64/mach64_context.h +++ b/src/mesa/drivers/dri/mach64/mach64_context.h @@ -164,7 +164,7 @@ struct mach64_texture_object { struct mach64_texture_object *prev; struct gl_texture_object *tObj; - PMemBlock memBlock; + struct mem_block *memBlock; GLuint offset; GLuint size; @@ -236,7 +236,7 @@ struct mach64_context { #else mach64TexObj TexObjList[MACH64_NR_TEX_HEAPS]; mach64TexObj SwappedOut; - memHeap_t *texHeap[MACH64_NR_TEX_HEAPS]; + struct mem_block *texHeap[MACH64_NR_TEX_HEAPS]; GLuint lastTexAge[MACH64_NR_TEX_HEAPS]; GLint firstTexHeap, lastTexHeap; #endif diff --git a/src/mesa/drivers/dri/s3v/s3v_context.h b/src/mesa/drivers/dri/s3v/s3v_context.h index 4b409fbf374..6f527f3a834 100644 --- a/src/mesa/drivers/dri/s3v/s3v_context.h +++ b/src/mesa/drivers/dri/s3v/s3v_context.h @@ -114,7 +114,7 @@ struct s3v_texture_object_t { int totalSize; int bound; - PMemBlock MemBlock; + struct mem_block *MemBlock; GLuint BufAddr; GLuint min_level; @@ -269,7 +269,7 @@ struct s3v_context { struct s3v_texture_object_t SwappedOut; GLenum TexEnvImageFmt[2]; - memHeap_t *texHeap; + struct mem_block *texHeap; int lastSwap; int texAge; diff --git a/src/mesa/drivers/dri/trident/trident_context.h b/src/mesa/drivers/dri/trident/trident_context.h index 7ebb5f2049b..b1e68b01663 100644 --- a/src/mesa/drivers/dri/trident/trident_context.h +++ b/src/mesa/drivers/dri/trident/trident_context.h @@ -197,7 +197,7 @@ struct trident_context { struct gamma_texture_object_t SwappedOut; GLenum TexEnvImageFmt[2]; - memHeap_t *texHeap; + struct mem_block *texHeap; int lastSwap; int texAge; |