From: Marek Olšák <maraeo@gmail.com>
Date: Tue, 27 Sep 2011 01:10:33 +0000 (+0200)
Subject: winsys/radeon: simplify updating GEM domains for relocations
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=798ebc91ebe383a702faf597ffbf2033dc467f50;p=mesa.git

winsys/radeon: simplify updating GEM domains for relocations
---

diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
index 2a1de535ea3..5e9851f80f1 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)