diff options
| author | Dave Airlie | 2009-12-18 00:56:49 +0100 |
|---|---|---|
| committer | Dave Airlie | 2009-12-18 00:56:49 +0100 |
| commit | dcd6dfcfe959bade75fbf49499775985d2cac5d5 (patch) | |
| tree | 45e37b24d7e34a1bdefe04e65633168873476ca7 /drivers/gpu/drm/radeon/r100_track.h | |
| parent | Merge remote branch 'korg/drm-vmware-staging' into drm-core-next (diff) | |
| parent | drm/radeon/kms: fix r100->r500 CS checker for compressed textures. (v2) (diff) | |
| download | kernel-qcow2-linux-dcd6dfcfe959bade75fbf49499775985d2cac5d5.tar.gz kernel-qcow2-linux-dcd6dfcfe959bade75fbf49499775985d2cac5d5.tar.xz kernel-qcow2-linux-dcd6dfcfe959bade75fbf49499775985d2cac5d5.zip | |
Merge branch 'drm-linus' into drm-core-next
Diffstat (limited to 'drivers/gpu/drm/radeon/r100_track.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/r100_track.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r100_track.h b/drivers/gpu/drm/radeon/r100_track.h index ca50903dd2bb..7188c3778ee2 100644 --- a/drivers/gpu/drm/radeon/r100_track.h +++ b/drivers/gpu/drm/radeon/r100_track.h @@ -28,6 +28,10 @@ struct r100_cs_cube_info { unsigned height; }; +#define R100_TRACK_COMP_NONE 0 +#define R100_TRACK_COMP_DXT1 1 +#define R100_TRACK_COMP_DXT35 2 + struct r100_cs_track_texture { struct radeon_bo *robj; struct r100_cs_cube_info cube_info[5]; /* info for 5 non-primary faces */ @@ -44,6 +48,7 @@ struct r100_cs_track_texture { bool enabled; bool roundup_w; bool roundup_h; + unsigned compress_format; }; struct r100_cs_track_limits { |