diff options
author | Matthias Hopf <mhopf@suse.de> | 2009-02-22 19:52:48 +0100 |
---|---|---|
committer | Matthias Hopf <mhopf@suse.de> | 2009-02-24 17:33:09 +0100 |
commit | 1f35e64801524fe65f2c44621f5688ffee4b5374 (patch) | |
tree | aeb09dffadd13a136ec0cdc46c2195914ba887d0 | |
parent | ed076ac7b61907bed55f646efa850a1e3cf70b4a (diff) |
Add pointer for free memory to adapter_t.
Also nuke unused depth* entries.
-rw-r--r-- | r600_demo.c | 7 | ||||
-rw-r--r-- | r600_lib.h | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/r600_demo.c b/r600_demo.c index e1f8fdf..e41b414 100644 --- a/r600_demo.c +++ b/r600_demo.c @@ -626,9 +626,8 @@ int main(int argc, char *argv[]) adapter.color_pitch = display_pitch; adapter.color_height = display_height; - adapter.depth_gpu = display_gpu + display_pitch*4*500; - adapter.depth_pitch = display_pitch; - adapter.depth_height = 480; + adapter.free_gpu = display_gpu + display_height*display_pitch*4; + adapter.free_cpu = adapter.display + display_height*display_pitch*4; if (verbose >= 1) { fprintf (stderr, "\nfb: gpu 0x" PRINTF_UINT64_HEX ", cpu %p, size 0x" PRINTF_UINT64_HEX "\n", @@ -637,8 +636,6 @@ int main(int argc, char *argv[]) adapter.display_gpu, adapter.display, adapter.display_width, adapter.display_height, adapter.display_pitch); fprintf (stderr, "color RT: gpu 0x" PRINTF_UINT64_HEX " (%dx%d)\n", adapter.color_gpu, adapter.color_pitch, adapter.color_height); - fprintf (stderr, "depth: gpu 0x" PRINTF_UINT64_HEX " (%dx%d)\n", - adapter.depth_gpu, adapter.depth_pitch, adapter.depth_height); fprintf (stderr, "gart: gpu 0x" PRINTF_UINT64_HEX ", cpu %p\n", gart_gpu, gart); fprintf (stderr, "gart bufs:gpu 0x" PRINTF_UINT64_HEX ", cpu %p\n", @@ -89,9 +89,9 @@ typedef struct { uint64_t color_gpu; uint32_t color_pitch; uint32_t color_height; - uint64_t depth_gpu; - uint32_t depth_pitch; - uint32_t depth_height; + + void *free_cpu; + uint64_t free_gpu; } adapter_t; /* TODO: Should go to _hwapi.h, probably moved to adapter_t / context_t */ |