TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

chunk-a-time vertex decompression

Browse Source
This commit is contained in:
David Rose 2008-07-22 00:15:59 +00:00
parent 6d25ba7710
commit 1a8870a03a
2 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
panda/src/gobj/vertexDataPage.cxx
View File

@ -364,15 +364,61 @@ make_resident() {
} }
size_t new_allocated_size = round_up(_uncompressed_size); size_t new_allocated_size = round_up(_uncompressed_size);
unsigned char *new_data = alloc_page_data(new_allocated_size); unsigned char *new_data = alloc_page_data(new_allocated_size);
unsigned char *end_data = new_data + new_allocated_size;
uLongf dest_len = _uncompressed_size; uLongf dest_len = _uncompressed_size;
int result = uncompress(new_data, &dest_len, _page_data, _size);
if (result != Z_OK) { z_stream z_source;
gobj_cat.error() #ifdef USE_MEMORY_NOWRAPPERS
<< "Couldn't expand: zlib error " << result << "\n"; z_source.zalloc = Z_NULL;
z_source.zfree = Z_NULL;
#else
z_source.zalloc = (alloc_func)&do_zlib_alloc;
z_source.zfree = (free_func)&do_zlib_free;
#endif
z_source.opaque = Z_NULL;
z_source.msg = "no error message";
z_source.next_in = (Bytef *)(char *)_page_data;
z_source.avail_in = _size;
z_source.next_out = (Bytef *)new_data;
z_source.avail_out = new_allocated_size;
int result = inflateInit(&z_source);
if (result < 0) {
nassert_raise("zlib error"); nassert_raise("zlib error");
memset(new_data, 0, new_allocated_size); return;
} }
nassertv(dest_len == _uncompressed_size); Thread::consider_yield();
size_t output_size = 0;
int flush = 0;
result = 0;
while (result != Z_STREAM_END) {
unsigned char *start_out = (unsigned char *)z_source.next_out;
nassertv(start_out < end_data);
z_source.avail_out = min((size_t)(end_data - start_out), (size_t)inflate_page_size);
nassertv(z_source.avail_out != 0);
result = inflate(&z_source, flush);
if (result < 0 && result != Z_BUF_ERROR) {
nassert_raise("zlib error");
return;
}
size_t bytes_produced = (size_t)((unsigned char *)z_source.next_out - start_out);
output_size += bytes_produced;
if (bytes_produced == 0) {
// If we ever produce no bytes, then start flushing the output.
flush = Z_FINISH;
}
Thread::consider_yield();
}
nassertv(z_source.avail_in == 0);
nassertv(output_size == _uncompressed_size);
result = inflateEnd(&z_source);
nassertv(result == Z_OK);
free_page_data(_page_data, _allocated_size); free_page_data(_page_data, _allocated_size);
_page_data = new_data; _page_data = new_data;

2
panda/src/gobj/vertexDataPage.h
View File

@ -169,7 +169,7 @@ private:
VertexDataBook *_book; // never changes. VertexDataBook *_book; // never changes.
enum { deflate_page_size = 1024 }; enum { deflate_page_size = 1024, inflate_page_size = 1024 };
// We build up a temporary linked list of these while deflating // We build up a temporary linked list of these while deflating
// (compressing) the vertex data in-memory. // (compressing) the vertex data in-memory.