tiennm99/godot
1
0
Fork 0
mirror of https://github.com/tiennm99/godot.git synced 2026-08-05 16:24:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Memory pool vectors (DVector) have been enormously simplified in code, and renamed to PoolVector

Browse Source
This commit is contained in:
Juan Linietsky
2017-01-07 18:26:38 -03:00
parent 2a38a5eaa8
commit 2ab83e1abb
257 changed files with 2818 additions and 3130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dds/texture_loader_dds.cpp
+7 -7
View File
@@ -223,7 +223,7 @@ RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path,
// print_line("found format: "+String(dds_format_info[dds_format].name));
DVector<uint8_t> src_data;
PoolVector<uint8_t> src_data;
const DDSFormatInfo &info=dds_format_info[dds_format];
uint32_t w = width;
@@ -247,9 +247,9 @@ RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path,
}
src_data.resize(size);
DVector<uint8_t>::Write wb = src_data.write();
PoolVector<uint8_t>::Write wb = src_data.write();
f->get_buffer(wb.ptr(),size);
wb=DVector<uint8_t>::Write();
wb=PoolVector<uint8_t>::Write();
} else if (info.palette) {
@@ -281,7 +281,7 @@ RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path,
}
src_data.resize(size + 256*colsize );
DVector<uint8_t>::Write wb = src_data.write();
PoolVector<uint8_t>::Write wb = src_data.write();
f->get_buffer(wb.ptr(),size);
for(int i=0;i<256;i++) {
@@ -296,7 +296,7 @@ RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path,
}
wb=DVector<uint8_t>::Write();
wb=PoolVector<uint8_t>::Write();
} else {
//uncompressed generic...
@@ -316,7 +316,7 @@ RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path,
size=size*2;
src_data.resize(size);
DVector<uint8_t>::Write wb = src_data.write();
PoolVector<uint8_t>::Write wb = src_data.write();
f->get_buffer(wb.ptr(),size);
@@ -449,7 +449,7 @@ RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path,
}
wb=DVector<uint8_t>::Write();
wb=PoolVector<uint8_t>::Write();
}