Mesa (master): winsys/radeon: simplify updating GEM domains for relocations

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 798ebc91ebe383a702faf597ffbf2033dc467f50
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=798ebc91ebe383a702faf597ffbf2033dc467f50

Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Sep 27 03:10:33 2011 +0200

winsys/radeon: simplify updating GEM domains for relocations

---

 src/gallium/winsys/radeon/drm/radeon_drm_cs.c |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
index 2a1de53..5e9851f 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
@@ -177,16 +177,8 @@ static INLINE void update_domains(struct drm_radeon_cs_reloc *reloc,
 {
     *added_domains = (rd | wd) & ~(reloc->read_domains | reloc->write_domain);
 
-    if (reloc->read_domains & wd) {
-        reloc->read_domains = rd;
-        reloc->write_domain = wd;
-    } else if (rd & reloc->write_domain) {
-        reloc->read_domains = rd;
-        reloc->write_domain |= wd;
-    } else {
-        reloc->read_domains |= rd;
-        reloc->write_domain |= wd;
-    }
+    reloc->read_domains |= rd;
+    reloc->write_domain |= wd;
 }
 
 int radeon_get_reloc(struct radeon_cs_context *csc, struct radeon_bo *bo)