Mesa (master): gallium/radeon: add the size only once in r600_context_add_resource_size

Marek Olšák mareko at kemper.freedesktop.org
Thu Apr 28 19:07:20 UTC 2016


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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Apr 28 16:57:09 2016 +0200

gallium/radeon: add the size only once in r600_context_add_resource_size

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

---

 src/gallium/drivers/radeon/r600_pipe_common.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index 823ba46..3c08221 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -353,12 +353,10 @@ void r600_context_add_resource_size(struct pipe_context *ctx, struct pipe_resour
 	 * In practice this gave very good estimate (+/- 10% of the target
 	 * memory limit).
 	 */
-	if (rr->domains & RADEON_DOMAIN_GTT) {
-		rctx->gtt += rr->buf->size;
-	}
-	if (rr->domains & RADEON_DOMAIN_VRAM) {
+	if (rr->domains & RADEON_DOMAIN_VRAM)
 		rctx->vram += rr->buf->size;
-	}
+	else if (rr->domains & RADEON_DOMAIN_GTT)
+		rctx->gtt += rr->buf->size;
 }
 
 /*




More information about the mesa-commit mailing list