diff options
| author | Leif Delgass <ldelgass@users.sourceforge.net> | 2003-02-05 22:58:55 +0000 |
|---|---|---|
| committer | Leif Delgass <ldelgass@users.sourceforge.net> | 2003-02-05 22:58:55 +0000 |
| commit | a26df4e63ecfcb72d917a62bbf7c4e93f17e1475 (patch) | |
| tree | c6e443bfef7f0f89c2ce405724f64310201bd21c | |
| parent | 3bf1f686a5d81a54c7e569a1fc1a5226b07898b6 (diff) | |
| download | drm-a26df4e63ecfcb72d917a62bbf7c4e93f17e1475.tar.gz | |
Fix texture aging bug, consolidate sarea texture heap tracking structs, fix
pointers to agp heap info in sarea, fixes for placeholder texobjs
(texmem stolen by other clients). Add debugging for local/global tex
heaps.
| -rw-r--r-- | shared-core/r128_drm.h | 2 | ||||
| -rw-r--r-- | shared-core/radeon_drm.h | 10 | ||||
| -rw-r--r-- | shared/r128_drm.h | 2 | ||||
| -rw-r--r-- | shared/radeon_drm.h | 10 |
4 files changed, 6 insertions, 18 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 512d36b9..19820661 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/r128_drm.h b/shared/r128_drm.h index bbb1a93b..61f51e93 100644 --- a/shared/r128_drm.h +++ b/shared/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/radeon_drm.h b/shared/radeon_drm.h index 512d36b9..19820661 100644 --- a/shared/radeon_drm.h +++ b/shared/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? */ |