aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r100_track.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-12-07 13:16:06 +1000
committerDave Airlie <airlied@redhat.com>2009-12-16 16:10:45 +1000
commitd785d78bbdb53580b12c40e820af5a3281ce2fc8 (patch)
tree080fad9ee53f058ee044e9bce4d151f860916be0 /drivers/gpu/drm/radeon/r100_track.h
parent6e7267721fd67d626433ea10c59fc232c6928259 (diff)
downloadmrst-s0i3-test-d785d78bbdb53580b12c40e820af5a3281ce2fc8.tar.gz
mrst-s0i3-test-d785d78bbdb53580b12c40e820af5a3281ce2fc8.tar.xz
mrst-s0i3-test-d785d78bbdb53580b12c40e820af5a3281ce2fc8.zip
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.h5
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 ca50903dd2b..7188c3778ee 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 {