diff options
author | Dave Airlie <airlied@redhat.com> | 2009-12-06 22:16:06 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-12-16 01:10:45 -0500 |
commit | d785d78bbdb53580b12c40e820af5a3281ce2fc8 (patch) | |
tree | 080fad9ee53f058ee044e9bce4d151f860916be0 /drivers/gpu/drm/radeon/r100_track.h | |
parent | 6e7267721fd67d626433ea10c59fc232c6928259 (diff) |
drm/radeon/kms: fix r100->r500 CS checker for compressed textures. (v2)
This adds support for compressed textures to the r100->r500 CS
checker, it lets me run openarena and the demos in mesa fine.
Thanks to Maciej Cencora for initial comments.
Changes since v1:
fix calculations with Maciej formulas
Reviewed-by: Maciej Cencora <m.cencora@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
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 { | |||
28 | unsigned height; | 28 | unsigned height; |
29 | }; | 29 | }; |
30 | 30 | ||
31 | #define R100_TRACK_COMP_NONE 0 | ||
32 | #define R100_TRACK_COMP_DXT1 1 | ||
33 | #define R100_TRACK_COMP_DXT35 2 | ||
34 | |||
31 | struct r100_cs_track_texture { | 35 | struct r100_cs_track_texture { |
32 | struct radeon_bo *robj; | 36 | struct radeon_bo *robj; |
33 | struct r100_cs_cube_info cube_info[5]; /* info for 5 non-primary faces */ | 37 | struct r100_cs_cube_info cube_info[5]; /* info for 5 non-primary faces */ |
@@ -44,6 +48,7 @@ struct r100_cs_track_texture { | |||
44 | bool enabled; | 48 | bool enabled; |
45 | bool roundup_w; | 49 | bool roundup_w; |
46 | bool roundup_h; | 50 | bool roundup_h; |
51 | unsigned compress_format; | ||
47 | }; | 52 | }; |
48 | 53 | ||
49 | struct r100_cs_track_limits { | 54 | struct r100_cs_track_limits { |