diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-25 17:02:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-26 13:24:21 +1000 |
| commit | e757bf964f4fd9ddbaa23ebaa47f743725aaf2c5 (patch) | |
| tree | 63447a741288154bb7db94c79fd65f78c90558a1 | |
| parent | 258686a973d7aef4bf956f540e99e65dc5bbee9c (diff) | |
r300: check buffer sizes in non-tcl case + set correct VRAM limits
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_render.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_common.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c index 402d2d7638..829d088033 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 9f646c4386..3ce868d2cf 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); } } |