diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-02-11 13:42:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-02-15 14:44:09 +1000 |
| commit | 8e0437914bb786d0b05be8f95e4ff37bf5a19f44 (patch) | |
| tree | 8335b15a46c75f560f602003750a4855b6d3bb99 /src/gallium/drivers/r600/r600_pipe.c | |
| parent | a661dacf143d7187abc2360ac945db75296f7e23 (diff) | |
r600g: add support for s3tc formats.
On r600, s3tc formats require a 1D tiled texture format,
so we have to do uploads using a blit, via the 64-bit and 128-bit formats
Based on the r600c code we use a 64 and 128-bit type to do the
blits.
Still requires R600_ENABLE_S3TC until the kernel fixes are in,
this has only been tested on evergreen where the kernel doesn't
yet get in the way.
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index f9e8e76d24..9d6c9bd542 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -30,6 +30,7 @@ #include <tgsi/tgsi_util.h> #include <util/u_blitter.h> #include <util/u_double_list.h> +#include <util/u_format_s3tc.h> #include <util/u_transfer.h> #include <util/u_surface.h> #include <util/u_pack_color.h> @@ -502,6 +503,7 @@ struct pipe_screen *r600_screen_create(struct radeon *radeon) r600_init_screen_resource_functions(&rscreen->screen); rscreen->tiling_info = r600_get_tiling_info(radeon); + util_format_s3tc_init(); util_slab_create(&rscreen->pool_buffers, sizeof(struct r600_resource_buffer), 64, |