diff options
| author | Brian Paul <[email protected]> | 2012-09-29 08:47:55 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-10-05 17:13:03 -0600 |
| commit | 5a63634a136caa905e7a1fa5da8fe5dc9f26add5 (patch) | |
| tree | 5c443a81a5f65de3916cdbbe943d5d0f72b00fd9 /src/mesa/drivers/dri/radeon/radeon_dma.c | |
| parent | 7fa0f10cd85ccb5afbc3a961164011de70970ff3 (diff) | |
radeon/r200: make radeon_context subclass of gl_context
radeon_context now contains a gl_context, rather than a pointer to one.
This will allow some minor core Mesa clean-up.
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_dma.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_dma.c b/src/mesa/drivers/dri/radeon/radeon_dma.c index 9193d13e83b..3497d481d4b 100644 --- a/src/mesa/drivers/dri/radeon/radeon_dma.c +++ b/src/mesa/drivers/dri/radeon/radeon_dma.c @@ -270,7 +270,7 @@ void radeonAllocDmaRegion(radeonContextPtr rmesa, fprintf(stderr, "%s %d\n", __FUNCTION__, bytes); if (rmesa->dma.flush) - rmesa->dma.flush(rmesa->glCtx); + rmesa->dma.flush(&rmesa->glCtx); assert(rmesa->dma.current_used == rmesa->dma.current_vertexptr); @@ -459,7 +459,7 @@ rcommonAllocDmaLowVerts( radeonContextPtr rmesa, int nverts, int vsize ) if(is_empty_list(&rmesa->dma.reserved) ||rmesa->dma.current_vertexptr + bytes > first_elem(&rmesa->dma.reserved)->bo->size) { if (rmesa->dma.flush) { - rmesa->dma.flush(rmesa->glCtx); + rmesa->dma.flush(&rmesa->glCtx); } radeonRefillCurrentDmaRegion(rmesa, bytes); @@ -469,7 +469,7 @@ rcommonAllocDmaLowVerts( radeonContextPtr rmesa, int nverts, int vsize ) if (!rmesa->dma.flush) { /* if cmdbuf flushed DMA restart */ - rmesa->glCtx->Driver.NeedFlush |= FLUSH_STORED_VERTICES; + rmesa->glCtx.Driver.NeedFlush |= FLUSH_STORED_VERTICES; rmesa->dma.flush = rcommon_flush_last_swtcl_prim; } @@ -499,7 +499,7 @@ void radeonReleaseArrays( struct gl_context *ctx, GLuint newinputs ) fprintf(stderr, "%s\n", __FUNCTION__); if (radeon->dma.flush) { - radeon->dma.flush(radeon->glCtx); + radeon->dma.flush(&radeon->glCtx); } for (i = 0; i < radeon->tcl.aos_count; i++) { if (radeon->tcl.aos[i].bo) { |