diff options
| author | Marek Olšák <maraeo@gmail.com> | 2011-02-10 10:16:21 +0100 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-02-10 11:27:35 +0100 |
| commit | 7c24a4c6a86402be1f68d23f4d52d4d071957801 (patch) | |
| tree | f376fc6a6b24bdf10eec03366be4bd8dc88bde3f /src/gallium/drivers/r300/r300_transfer.c | |
| parent | 56ba7e913fef0ea2b1bead582108f9ab3ab8263d (diff) | |
| download | external_mesa3d-7c24a4c6a86402be1f68d23f4d52d4d071957801.zip external_mesa3d-7c24a4c6a86402be1f68d23f4d52d4d071957801.tar.gz external_mesa3d-7c24a4c6a86402be1f68d23f4d52d4d071957801.tar.bz2 | |
r300g: add a way to change texture properties arbitrarily
So that we can implement resource_copy on arbitrary data.
Diffstat (limited to 'src/gallium/drivers/r300/r300_transfer.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_transfer.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/drivers/r300/r300_transfer.c b/src/gallium/drivers/r300/r300_transfer.c index 7265fa7..f2b6b45 100644 --- a/src/gallium/drivers/r300/r300_transfer.c +++ b/src/gallium/drivers/r300/r300_transfer.c @@ -116,6 +116,11 @@ r300_texture_get_transfer(struct pipe_context *ctx, * Also make write transfers pipelined. */ if (tex->tex.microtile || tex->tex.macrotile[level] || ((referenced_hw & !(usage & PIPE_TRANSFER_READ)) && blittable)) { + if (r300->blitter->running) { + fprintf(stderr, "r300: ERROR: Blitter recursion in texture_get_transfer.\n"); + os_break(); + } + base.target = PIPE_TEXTURE_2D; base.format = texture->format; base.width0 = box->width; |