From: Dave Airlie <airlied@redhat.com>
Date: Wed, 25 Mar 2009 07:02:32 +0000 (+1000)
Subject: r300: check buffer sizes in non-tcl case + set correct VRAM limits
X-Git-Tag: android-x86-1.6~16^2~1450
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e757bf964f4fd9ddbaa23ebaa47f743725aaf2c5;p=android-x86%2Fexternal-mesa.git

r300: check buffer sizes in non-tcl case + set correct VRAM limits
---

diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index 402d2d76388..829d088033a 100644
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -490,6 +490,9 @@ static GLboolean r300RunNonTCLRender(GLcontext * ctx,
 	if (!(rmesa->radeon.radeonScreen->chip_flags & RADEON_CHIPSET_TCL))
  	        return GL_TRUE;
 
+	if (!r300ValidateBuffers(ctx))
+	    return GL_TRUE;
+	
 	return r300RunRender(ctx, stage);
 }
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
index 9f646c4386c..3ce868d2cf3 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common.c
@@ -1094,7 +1094,7 @@ void rcommonInitCmdBuf(radeonContextPtr rmesa)
 
 		if (!drmCommandWriteRead(rmesa->dri.fd, DRM_RADEON_GEM_INFO, &mminfo, sizeof(mminfo)))
 		{
-			radeon_cs_set_limit(rmesa->cmdbuf.cs, RADEON_GEM_DOMAIN_VRAM, mminfo.vram_size);
+			radeon_cs_set_limit(rmesa->cmdbuf.cs, RADEON_GEM_DOMAIN_VRAM, mminfo.vram_visible);
 			radeon_cs_set_limit(rmesa->cmdbuf.cs, RADEON_GEM_DOMAIN_GTT, mminfo.gart_size);
 		}
 	}