diff options
| author | Marek Olšák <[email protected]> | 2012-01-29 23:25:42 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-01-31 23:12:30 +0100 |
| commit | e4340c1908a6a3b09e1a15d5195f6da7d00494d0 (patch) | |
| tree | 593986b14150b70682913d4c37e4e97ad3f19492 /src/gallium/drivers/r600/r600_resource.h | |
| parent | 78293b99b23268e6698f1267aaf40647c17d95a5 (diff) | |
r600g: merge r600_context with r600_pipe_context
The split made no sense.
Diffstat (limited to 'src/gallium/drivers/r600/r600_resource.h')
| -rw-r--r-- | src/gallium/drivers/r600/r600_resource.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_resource.h b/src/gallium/drivers/r600/r600_resource.h index f39ac55e877..1a32c056dd4 100644 --- a/src/gallium/drivers/r600/r600_resource.h +++ b/src/gallium/drivers/r600/r600_resource.h @@ -98,9 +98,9 @@ void* r600_texture_transfer_map(struct pipe_context *ctx, void r600_texture_transfer_unmap(struct pipe_context *ctx, struct pipe_transfer* transfer); -struct r600_pipe_context; +struct r600_context; -void r600_upload_const_buffer(struct r600_pipe_context *rctx, struct r600_resource **rbuffer, uint32_t *offset); +void r600_upload_const_buffer(struct r600_context *rctx, struct r600_resource **rbuffer, uint32_t *offset); uint64_t r600_resource_va(struct pipe_screen *screen, struct pipe_resource *resource); |