diff options
| author | Ian Romanick <idr@us.ibm.com> | 2003-04-30 01:51:00 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2003-04-30 01:51:00 +0000 |
| commit | 285b1cdc39d9cc47e3ff74b9f9b56c24317beec5 (patch) | |
| tree | 4316ca19018d67a2981470fe6029177880a69572 /shared-core | |
| parent | 7e1a4bfab3648a83cf2f8eed01c6ac346829aa3c (diff) | |
Merged texmem-0-0-1texmem-0-0-1-20030429-merge
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/r128_drm.h | 2 | ||||
| -rw-r--r-- | shared-core/radeon_drm.h | 10 | ||||
| -rw-r--r-- | shared-core/radeon_drv.h | 1 |
3 files changed, 4 insertions, 9 deletions
diff --git a/shared-core/r128_drm.h b/shared-core/r128_drm.h index bbb1a93b..61f51e93 100644 --- a/shared-core/r128_drm.h +++ b/shared-core/r128_drm.h @@ -162,7 +162,7 @@ typedef struct drm_r128_sarea { unsigned int last_dispatch; drm_tex_region_t tex_list[R128_NR_TEX_HEAPS][R128_NR_TEX_REGIONS+1]; - int tex_age[R128_NR_TEX_HEAPS]; + unsigned int tex_age[R128_NR_TEX_HEAPS]; int ctx_owner; } drm_r128_sarea_t; diff --git a/shared-core/radeon_drm.h b/shared-core/radeon_drm.h index 27eeb003..7efb3c16 100644 --- a/shared-core/radeon_drm.h +++ b/shared-core/radeon_drm.h @@ -323,12 +323,6 @@ typedef struct { typedef struct { - unsigned char next, prev; - unsigned char in_use; - int age; -} drm_radeon_tex_region_t; - -typedef struct { /* The channel for communication of state information to the * kernel on firing a vertex buffer with either of the * obsoleted vertex/index ioctls. @@ -350,8 +344,8 @@ typedef struct { unsigned int last_dispatch; unsigned int last_clear; - drm_radeon_tex_region_t tex_list[RADEON_NR_TEX_HEAPS][RADEON_NR_TEX_REGIONS+1]; - int tex_age[RADEON_NR_TEX_HEAPS]; + drm_tex_region_t tex_list[RADEON_NR_TEX_HEAPS][RADEON_NR_TEX_REGIONS+1]; + unsigned int tex_age[RADEON_NR_TEX_HEAPS]; int ctx_owner; int pfState; /* number of 3d windows (0,1,2ormore) */ int pfCurrentPage; /* which buffer is being displayed? */ diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h index 07d747a6..3e3b263e 100644 --- a/shared-core/radeon_drv.h +++ b/shared-core/radeon_drv.h @@ -581,6 +581,7 @@ extern void radeon_do_release(drm_device_t *dev); #define RADEON_TXFORMAT_ARGB4444 5 #define RADEON_TXFORMAT_ARGB8888 6 #define RADEON_TXFORMAT_RGBA8888 7 +#define RADEON_TXFORMAT_Y8 8 #define RADEON_TXFORMAT_VYUY422 10 #define RADEON_TXFORMAT_YVYU422 11 #define RADEON_TXFORMAT_DXT1 12 |