From: Eric Anholt <eric@anholt.net>
Date: Wed, 2 Nov 2011 21:38:05 +0000 (-0700)
Subject: radeon: Check an error return instead of assigning it to a dead variable.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9954a93ab77e64b01b95837f90a567df9e8c94df;p=mesa.git

radeon: Check an error return instead of assigning it to a dead variable.

Fixes gcc set-but-unused-variable warning.

Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
---

diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c
index 2694dafc75f..e6c7f94af06 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c
@@ -551,11 +551,19 @@ radeon_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable,
 			}
 
 			ret = radeon_bo_get_tiling(bo, &tiling_flags, &pitch);
-			if (tiling_flags & RADEON_TILING_MACRO)
-				bo->flags |= RADEON_BO_FLAGS_MACRO_TILE;
-			if (tiling_flags & RADEON_TILING_MICRO)
-				bo->flags |= RADEON_BO_FLAGS_MICRO_TILE;
-
+			if (ret) {
+				fprintf(stderr,
+					"failed to get tiling for %s %d\n",
+					regname, buffers[i].name);
+				radeon_bo_unref(bo);
+				bo = NULL;
+				continue;
+			} else {
+				if (tiling_flags & RADEON_TILING_MACRO)
+					bo->flags |= RADEON_BO_FLAGS_MACRO_TILE;
+				if (tiling_flags & RADEON_TILING_MICRO)
+					bo->flags |= RADEON_BO_FLAGS_MICRO_TILE;
+			}
 		}
 
 		if (buffers[i].attachment == __DRI_BUFFER_DEPTH) {