diff options
| author | Dave Airlie <[email protected]> | 2011-10-10 20:35:34 +0100 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2011-10-10 20:53:26 +0100 |
| commit | 95fd5e5aba2e21ab20cb971506a81c0049b5a694 (patch) | |
| tree | d112a103a7b42cbe2f6c431b22552bdcde9e7f90 /src/gallium/drivers/r600/r600_blit.c | |
| parent | 8d3e505ed66cbaa93782acdd5b296704392fcb06 (diff) | |
r600g: drop force int type workaround
now that we have integer texture types I can drop this workaround so that
copies of values is done properly (as floats would fail on some corner cases).
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_blit.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_blit.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c index 28e0e3c613a..6c4a66471ff 100644 --- a/src/gallium/drivers/r600/r600_blit.c +++ b/src/gallium/drivers/r600/r600_blit.c @@ -282,14 +282,13 @@ static void r600_compressed_to_blittable(struct pipe_resource *tex, orig->height0 = tex->height0; if (pixsize == 8) - new_format = PIPE_FORMAT_R16G16B16A16_UNORM; /* 64-bit block */ + new_format = PIPE_FORMAT_R16G16B16A16_UINT; /* 64-bit block */ else - new_format = PIPE_FORMAT_R32G32B32A32_UNORM; /* 128-bit block */ + new_format = PIPE_FORMAT_R32G32B32A32_UINT; /* 128-bit block */ new_width = util_format_get_nblocksx(tex->format, orig->width0); new_height = util_format_get_nblocksy(tex->format, orig->height0); - rtex->force_int_type = true; tex->width0 = new_width; tex->height0 = new_height; tex->format = new_format; @@ -300,7 +299,6 @@ static void r600_reset_blittable_to_compressed(struct pipe_resource *tex, struct texture_orig_info *orig) { struct r600_resource_texture *rtex = (struct r600_resource_texture*)tex; - rtex->force_int_type = false; tex->format = orig->format; tex->width0 = orig->width0; |