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

Author: Eric Anholt <[email protected]>
Date:   Wed Nov  2 14:38:05 2011 -0700

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

Fixes gcc set-but-unused-variable warning.

Reviewed-by: Alex Deucher <[email protected]>

---

 .../drivers/dri/radeon/radeon_common_context.c     |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c 
b/src/mesa/drivers/dri/radeon/radeon_common_context.c
index 2694daf..e6c7f94 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) {

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to