Module: Mesa
Branch: gallium-resources
Commit: 7cbb7051f42c0220b35ce1e834853dac8706a69a
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=7cbb7051f42c0220b35ce1e834853dac8706a69a

Author: Eric Anholt <[email protected]>
Date:   Fri Mar 12 17:12:14 2010 -0800

meta: Fix up restoration of state if _mesa_map_pbo_source() fails.

---

 src/mesa/drivers/common/meta.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index b29f58d..84a2a5f 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -2067,8 +2067,10 @@ _mesa_meta_Bitmap(GLcontext *ctx,
    }
 
    bitmap1 = _mesa_map_pbo_source(ctx, &unpackSave, bitmap1);
-   if (!bitmap1)
+   if (!bitmap1) {
+      _mesa_meta_end(ctx);
       return;
+   }
 
    bitmap8 = (GLubyte *) calloc(1, width * height);
    if (bitmap8) {

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

Reply via email to