diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2009-04-26 21:20:54 +0200 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-04-26 21:20:54 +0200 |
commit | 16a993d8b17ef623a21b003f6f08adb86c76de77 (patch) | |
tree | 14ee6fc09728ae9190dcd78df9b310da1c5c8135 | |
parent | 22997a5a5d4f53872d3a3073611c0cd7f1bcc263 (diff) |
Fix size/offset bugs in the new memory management code.
-rw-r--r-- | src/glamo-draw.c | 6 | ||||
-rw-r--r-- | src/glamo-driver.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/glamo-draw.c b/src/glamo-draw.c index 78fcbf2..d0590d3 100644 --- a/src/glamo-draw.c +++ b/src/glamo-draw.c @@ -241,11 +241,11 @@ GLAMODrawExaInit(ScrnInfoPtr pScrn, size_t mem_start, size_t mem_size) if(!exa) return FALSE; - pGlamo->exa->memoryBase = pGlamo->fbstart + mem_start; - pGlamo->exa->memorySize = mem_size; + pGlamo->exa->memoryBase = pGlamo->fbstart; + pGlamo->exa->memorySize = mem_size + mem_start; /* TODO: Initalize offScreenBase based on the current screen resolution * (width*height*depth) */ - pGlamo->exa->offScreenBase = 480 * 640 * 2; + pGlamo->exa->offScreenBase = mem_start; exa->exa_major = EXA_VERSION_MAJOR; exa->exa_minor = EXA_VERSION_MINOR; diff --git a/src/glamo-driver.c b/src/glamo-driver.c index ac3db86..d6d9624 100644 --- a/src/glamo-driver.c +++ b/src/glamo-driver.c @@ -522,8 +522,8 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) GlamoPtr pGlamo = GlamoPTR(pScrn); VisualPtr visual; int ret, flags; - size_t mem_start = 0; - size_t mem_size = 1024 * 1024 * 4; + size_t mem_start = 640 * 480 * 2; + size_t mem_size = 1024 * 1024 * 4 - mem_start; TRACE_ENTER("GlamoScreenInit"); |