diff options
| author | Marek Olšák <[email protected]> | 2011-09-11 22:24:38 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2011-09-30 23:19:52 +0200 |
| commit | 6101b6d442b06a347c001fe85848d636ab7df260 (patch) | |
| tree | f345c754e5fb587997f150f3dd4434d88123f592 /src/gallium/winsys/radeon | |
| parent | ba89086e79b22bd9578ea642846108de624c91e9 (diff) | |
r600g: merge r600_bo with r600_resource
I have moved 'last_flush' and 'binding' from r600_bo to winsys/radeon.
The other members are now part of r600_resource.
Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/winsys/radeon')
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_bo.h | 4 | ||||
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_winsys.h | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.h b/src/gallium/winsys/radeon/drm/radeon_drm_bo.h index 95a96ad0374..a3dbde76dcd 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.h +++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.h @@ -46,6 +46,10 @@ struct radeon_bo_desc { struct radeon_bo { struct pb_buffer base; + + unsigned last_flush; + unsigned binding; + struct radeon_bomgr *mgr; struct radeon_drm_winsys *rws; diff --git a/src/gallium/winsys/radeon/drm/radeon_winsys.h b/src/gallium/winsys/radeon/drm/radeon_winsys.h index 90583e3ab8c..b92dad8155e 100644 --- a/src/gallium/winsys/radeon/drm/radeon_winsys.h +++ b/src/gallium/winsys/radeon/drm/radeon_winsys.h @@ -68,7 +68,15 @@ enum radeon_bo_usage { /* bitfield */ }; struct winsys_handle; -struct radeon_winsys_cs_handle; /* for write_reloc etc. */ + +struct radeon_winsys_cs_handle { /* for write_reloc etc. */ + struct { + struct pb_buffer base; + } _private; + + unsigned last_flush; + unsigned binding; +}; struct radeon_winsys_cs { unsigned cdw; /* Number of used dwords. */ |