From: Eric Anholt <eric@anholt.net>
Date: Thu, 11 Apr 2013 17:30:51 +0000 (-0700)
Subject: intel: Return failure properly in the texsubimage blit path.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6cec233c62a8f455992036f380f3447f90a2715a;p=mesa.git

intel: Return failure properly in the texsubimage blit path.

We assert that failure doesn't happen, but it fixes a warning in the
release build and it would at least give working behavior for a user by
falling back to the normal texsubimage path.

Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/drivers/dri/intel/intel_tex_subimage.c b/src/mesa/drivers/dri/intel/intel_tex_subimage.c
index b02e5fc549a..42cc7392927 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_subimage.c
@@ -146,7 +146,7 @@ intel_blit_texsubimage(struct gl_context * ctx,
    drm_intel_bo_unreference(temp_bo);
    _mesa_unmap_teximage_pbo(ctx, packing);
 
-   return true;
+   return ret;
 }
 
 /**