summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/drivers/dri/common')
-rw-r--r--src/mesa/drivers/dri/common/texmem.c2
-rw-r--r--src/mesa/drivers/dri/common/texmem.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/common/texmem.c b/src/mesa/drivers/dri/common/texmem.c
index c3f6ec9bae..7cf2e21b63 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 5c1fc32384..22d1755895 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.