Mesa (openchrome-branch): openchrome: Fixes from previous commit.

Thomas Hellstrom thomash at kemper.freedesktop.org
Tue Mar 24 22:10:01 UTC 2009


Module: Mesa
Branch: openchrome-branch
Commit: e126841cd18fa092c4df7fe3b976558a4d065b1f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e126841cd18fa092c4df7fe3b976558a4d065b1f

Author: Thomas Hellstrom <thomas-at-shipmail-dot-org>
Date:   Tue Mar 24 22:55:21 2009 +0100

openchrome: Fixes from previous commit.

Signed-off-by: Thomas Hellstrom <thomas-at-shipmail-dot-org>

---

 src/mesa/drivers/dri/openchrome/via_tex.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/openchrome/via_tex.c b/src/mesa/drivers/dri/openchrome/via_tex.c
index 3e3f231..29fc544 100644
--- a/src/mesa/drivers/dri/openchrome/via_tex.c
+++ b/src/mesa/drivers/dri/openchrome/via_tex.c
@@ -904,7 +904,7 @@ viaGetCompressedTexImage(GLcontext * ctx, GLenum target, GLint level,
     texImage->Data = wsbmBOMap(viaImage->buf, WSBM_ACCESS_READ);
 
     _mesa_get_compressed_teximage(ctx, target, level, img, texObj, texImage);
-    texImage->Data = VIA_INVALID_TEXMAP;
+    texImage->Data = NULL;
     wsbmBOUnmap(viaImage->buf);
     wsbmBOReleaseFromCpu(viaImage->buf, WSBM_SYNCCPU_READ);
 }
@@ -1083,11 +1083,11 @@ via_map_unmap_texunit(struct gl_texture_unit *tu, GLboolean map)
 			wsbmBOReleaseFromCpu(vImage->buf,
 					      WSBM_SYNCCPU_READ |
 					      WSBM_SYNCCPU_WRITE);
-			image->Data = VIA_INVALID_TEXMAP;
+			image->Data = NULL;
 			return -ENOMEM;
 		    }
 		} else {
-		    if (image->Data != VIA_INVALID_TEXMAP) {
+		    if (image->Data != NULL) {
 			wsbmBOUnmap(vImage->buf);
 			image->Data = NULL;
 			wsbmBOReleaseFromCpu(vImage->buf,




More information about the mesa-commit mailing list