Mesa (master): intel: Return failure properly in the texsubimage blit path.
Eric Anholt
anholt at kemper.freedesktop.org
Fri Apr 12 23:48:22 UTC 2013
Module: Mesa
Branch: master
Commit: 6cec233c62a8f455992036f380f3447f90a2715a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6cec233c62a8f455992036f380f3447f90a2715a
Author: Eric Anholt <eric at anholt.net>
Date: Thu Apr 11 10:30:51 2013 -0700
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 at gmail.com>
---
src/mesa/drivers/dri/intel/intel_tex_subimage.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_tex_subimage.c b/src/mesa/drivers/dri/intel/intel_tex_subimage.c
index b02e5fc..42cc739 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;
}
/**
More information about the mesa-commit
mailing list