KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r300g: try harder to create a transfer object 

I was told this wouldn't help to fix the FDO bug #28443, but still,
it's a harmless last resort.

Also, linear textures safely fallback to an unpipelined transfer here.
This commit is contained in:
Marek Olšák 2010-06-09 21:29:26 +02:00
parent 1d11eac93f
commit 45fb47d50c
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/gallium/drivers/r300/r300_transfer.c
View File

@ -162,6 +162,29 @@ r300_texture_get_transfer(struct pipe_context *ctx,
ctx->screen->resource_create(ctx->screen,
&base));
if (!trans->detiled_texture) {
/* Oh crap, the thing can't create the texture.
* Let's flush and try again. */
ctx->flush(ctx, 0, NULL);
trans->detiled_texture = r300_texture(
ctx->screen->resource_create(ctx->screen,
&base));
if (!trans->detiled_texture) {
/* For linear textures, it's safe to fallback to
* an unpipelined transfer. */
if (!tex->microtile && !tex->macrotile) {
goto unpipelined;
}
/* Otherwise, go to hell. */
fprintf(stderr,
"r300: Failed to create a transfer object, praise.\n");
return NULL;
}
}
assert(!trans->detiled_texture->microtile &&
!trans->detiled_texture->macrotile);
@ -183,16 +206,20 @@ r300_texture_get_transfer(struct pipe_context *ctx,
/* Always referenced in the blit. */
ctx->flush(ctx, 0, NULL);
}
} else {
trans->transfer.stride =
r300_texture_get_stride(r300screen, tex, sr.level);
trans->offset = r300_texture_get_offset(tex, sr.level, box->z, sr.face);
if (referenced_cs && (usage & PIPE_TRANSFER_READ))
ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);
return &trans->transfer;
}
unpipelined:
/* Unpipelined transfer. */
trans->transfer.stride =
r300_texture_get_stride(r300screen, tex, sr.level);
trans->offset = r300_texture_get_offset(tex, sr.level, box->z, sr.face);
if (referenced_cs && (usage & PIPE_TRANSFER_READ))
ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);
return &trans->transfer;
}
return &trans->transfer;
return NULL;
}
void r300_texture_transfer_destroy(struct pipe_context *ctx,