diff options
author | Marek Olšák <maraeo@gmail.com> | 2013-01-11 17:10:36 +0100 |
---|---|---|
committer | Marek Olšák <maraeo@gmail.com> | 2013-01-14 03:11:42 +0100 |
commit | 3f584c211a0587c4cf5e6d36275390cd7181b5c8 (patch) | |
tree | 5e0dde128167d181415b3ea6ffdef2d75f513fec /src/gallium/winsys | |
parent | 4d6faf51755d2f8492a1b46e9b5d03ff7e8f4871 (diff) |
r300g: random hyperz cleanups
Diffstat (limited to 'src/gallium/winsys')
-rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index bcfb448db5d..b8a876c1662 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -101,7 +101,8 @@ static struct util_hash_table *fd_tab = NULL; static boolean radeon_set_fd_access(struct radeon_drm_cs *applier, struct radeon_drm_cs **owner, pipe_mutex *mutex, - unsigned request, boolean enable) + unsigned request, const char *request_name, + boolean enable) { struct drm_radeon_info info; unsigned value = enable ? 1 : 0; @@ -136,17 +137,13 @@ static boolean radeon_set_fd_access(struct radeon_drm_cs *applier, if (enable) { if (value) { *owner = applier; - if (request == RADEON_INFO_WANT_HYPERZ) { - printf("radeon: Acquired Hyper-Z.\n"); - } + printf("radeon: Acquired access to %s.\n", request_name); pipe_mutex_unlock(*mutex); return TRUE; } } else { *owner = NULL; - if (request == RADEON_INFO_WANT_HYPERZ) { - printf("radeon: Released Hyper-Z.\n"); - } + printf("radeon: Released access to %s.\n", request_name); } pipe_mutex_unlock(*mutex); @@ -426,16 +423,14 @@ static boolean radeon_cs_request_feature(struct radeon_winsys_cs *rcs, case RADEON_FID_R300_HYPERZ_ACCESS: return radeon_set_fd_access(cs, &cs->ws->hyperz_owner, &cs->ws->hyperz_owner_mutex, - RADEON_INFO_WANT_HYPERZ, enable); + RADEON_INFO_WANT_HYPERZ, "Hyper-Z", + enable); case RADEON_FID_R300_CMASK_ACCESS: - if (debug_get_bool_option("RADEON_CMASK", FALSE)) { - return radeon_set_fd_access(cs, &cs->ws->cmask_owner, - &cs->ws->cmask_owner_mutex, - RADEON_INFO_WANT_CMASK, enable); - } else { - return FALSE; - } + return radeon_set_fd_access(cs, &cs->ws->cmask_owner, + &cs->ws->cmask_owner_mutex, + RADEON_INFO_WANT_CMASK, "AA optimizations", + enable); } return FALSE; } |