summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys/radeon/drm/radeon_winsys.h
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-08-04 02:36:57 +0200
committerMarek Olšák <maraeo@gmail.com>2011-08-16 09:15:10 +0200
commit03b25ad8ffd72f1f88b6c80a2ebfe3cf6e8a6390 (patch)
treebb1081425fdfaa077e7e8434011954f3cfeb6925 /src/gallium/winsys/radeon/drm/radeon_winsys.h
parente6fb62594fca714883af9bba9795be8838c16900 (diff)
downloadexternal_mesa3d-03b25ad8ffd72f1f88b6c80a2ebfe3cf6e8a6390.zip
external_mesa3d-03b25ad8ffd72f1f88b6c80a2ebfe3cf6e8a6390.tar.gz
external_mesa3d-03b25ad8ffd72f1f88b6c80a2ebfe3cf6e8a6390.tar.bz2
winsys/radeon: consolidate the add_reloc function
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src/gallium/winsys/radeon/drm/radeon_winsys.h')
-rw-r--r--src/gallium/winsys/radeon/drm/radeon_winsys.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/gallium/winsys/radeon/drm/radeon_winsys.h b/src/gallium/winsys/radeon/drm/radeon_winsys.h
index 073b6aa..6360d6a 100644
--- a/src/gallium/winsys/radeon/drm/radeon_winsys.h
+++ b/src/gallium/winsys/radeon/drm/radeon_winsys.h
@@ -259,11 +259,12 @@ struct radeon_winsys {
* \param buf A winsys buffer to validate.
* \param rd A read domain containing a bitmask of the RADEON_DOMAIN_* flags.
* \param wd A write domain containing a bitmask of the RADEON_DOMAIN_* flags.
+ * \return Relocation index.
*/
- void (*cs_add_reloc)(struct radeon_winsys_cs *cs,
- struct radeon_winsys_cs_handle *buf,
- enum radeon_bo_domain rd,
- enum radeon_bo_domain wd);
+ unsigned (*cs_add_reloc)(struct radeon_winsys_cs *cs,
+ struct radeon_winsys_cs_handle *buf,
+ enum radeon_bo_domain rd,
+ enum radeon_bo_domain wd);
/**
* Return TRUE if there is enough memory in VRAM and GTT for the relocs
@@ -329,10 +330,6 @@ struct radeon_winsys {
/* Transitional functions for r600g when moving to winsys/radeon */
unsigned (*trans_get_buffer_handle)(struct pb_buffer *buf);
- unsigned (*trans_add_reloc)(struct radeon_winsys_cs *cs,
- struct radeon_winsys_cs_handle *buf,
- enum radeon_bo_domain rd,
- enum radeon_bo_domain wd);
};
#endif