diff options
| author | Christian König <[email protected]> | 2010-11-24 21:40:50 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-11-24 21:40:50 +0100 |
| commit | 431e72984b12e6ef0a1668814ec54b14255f98a1 (patch) | |
| tree | e79aa9401a91dac8820ec11652394796f1df1a49 /src/gallium | |
| parent | a51b0daa59c03cae8cc67baa48c11ff63155cbcb (diff) | |
r600g: reenable texture uploads, but keep R16_SNORM disabled
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/r600/r600_texture.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index b7600e90eb5..ec7bd0d75cd 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -531,6 +531,9 @@ static boolean permit_hardware_blit(struct pipe_screen *screen, PIPE_BIND_SAMPLER_VIEW, 0)) return FALSE; + if (res->format == PIPE_FORMAT_R16_SNORM) + return FALSE; + return TRUE; } @@ -571,8 +574,8 @@ struct pipe_transfer* r600_texture_get_transfer(struct pipe_context *ctx, PIPE_TRANSFER_UNSYNCHRONIZED))) use_staging_texture = TRUE; - /*if (!permit_hardware_blit(ctx->screen, texture) || - (texture->flags & R600_RESOURCE_FLAG_TRANSFER))*/ + if (!permit_hardware_blit(ctx->screen, texture) || + (texture->flags & R600_RESOURCE_FLAG_TRANSFER)) use_staging_texture = FALSE; trans = CALLOC_STRUCT(r600_transfer); |