godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19074 from cart/optimize-mono-pool-marshal 

Reduce allocations when converting mono arrays to pool arrays
This commit is contained in:
Ignacio Etcheverry 2018-05-25 11:04:16 +02:00 committed by GitHub
parent d522bf3b9f 56262ceafe
commit a830e633a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/mono/mono_gd/gd_mono_marshal.cpp
View File

@ -607,10 +607,11 @@ MonoArray *Array_to_mono_array(const Array &p_array) {
Array mono_array_to_Array(MonoArray *p_array) { Array mono_array_to_Array(MonoArray *p_array) {
Array ret; Array ret;
int length = mono_array_length(p_array); int length = mono_array_length(p_array);
ret.resize(length);
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
MonoObject *elem = mono_array_get(p_array, MonoObject *, i); MonoObject *elem = mono_array_get(p_array, MonoObject *, i);
ret.push_back(mono_object_to_variant(elem)); ret[i] = mono_object_to_variant(elem);
} }
return ret; return ret;
@ -631,10 +632,10 @@ MonoArray *PoolIntArray_to_mono_array(const PoolIntArray &p_array) {
PoolIntArray mono_array_to_PoolIntArray(MonoArray *p_array) { PoolIntArray mono_array_to_PoolIntArray(MonoArray *p_array) {
PoolIntArray ret; PoolIntArray ret;
int length = mono_array_length(p_array); int length = mono_array_length(p_array);
ret.resize(length);
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
int32_t elem = mono_array_get(p_array, int32_t, i); int32_t elem = mono_array_get(p_array, int32_t, i);
ret.push_back(elem); ret.set(i, elem);
} }
return ret; return ret;
@ -653,10 +654,11 @@ MonoArray *PoolByteArray_to_mono_array(const PoolByteArray &p_array) {
PoolByteArray mono_array_to_PoolByteArray(MonoArray *p_array) { PoolByteArray mono_array_to_PoolByteArray(MonoArray *p_array) {
PoolByteArray ret; PoolByteArray ret;
int length = mono_array_length(p_array); int length = mono_array_length(p_array);
ret.resize(length);
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
uint8_t elem = mono_array_get(p_array, uint8_t, i); uint8_t elem = mono_array_get(p_array, uint8_t, i);
ret.push_back(elem); ret.set(i, elem);
} }
return ret; return ret;
@ -675,10 +677,11 @@ MonoArray *PoolRealArray_to_mono_array(const PoolRealArray &p_array) {
PoolRealArray mono_array_to_PoolRealArray(MonoArray *p_array) { PoolRealArray mono_array_to_PoolRealArray(MonoArray *p_array) {
PoolRealArray ret; PoolRealArray ret;
int length = mono_array_length(p_array); int length = mono_array_length(p_array);
ret.resize(length);
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
real_t elem = mono_array_get(p_array, real_t, i); real_t elem = mono_array_get(p_array, real_t, i);
ret.push_back(elem); ret.set(i, elem);
} }
return ret; return ret;
@ -698,10 +701,11 @@ MonoArray *PoolStringArray_to_mono_array(const PoolStringArray &p_array) {
PoolStringArray mono_array_to_PoolStringArray(MonoArray *p_array) { PoolStringArray mono_array_to_PoolStringArray(MonoArray *p_array) {
PoolStringArray ret; PoolStringArray ret;
int length = mono_array_length(p_array); int length = mono_array_length(p_array);
ret.resize(length);
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
MonoString *elem = mono_array_get(p_array, MonoString *, i); MonoString *elem = mono_array_get(p_array, MonoString *, i);
ret.push_back(mono_string_to_godot(elem)); ret.set(i, mono_string_to_godot(elem));
} }
return ret; return ret;
@ -729,11 +733,12 @@ MonoArray *PoolColorArray_to_mono_array(const PoolColorArray &p_array) {
PoolColorArray mono_array_to_PoolColorArray(MonoArray *p_array) { PoolColorArray mono_array_to_PoolColorArray(MonoArray *p_array) {
PoolColorArray ret; PoolColorArray ret;
int length = mono_array_length(p_array); int length = mono_array_length(p_array);
ret.resize(length);
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
real_t *raw_elem = (real_t *)mono_array_addr_with_size(p_array, sizeof(real_t) * 4, i); real_t *raw_elem = (real_t *)mono_array_addr_with_size(p_array, sizeof(real_t) * 4, i);
MARSHALLED_IN(Color, raw_elem, elem); MARSHALLED_IN(Color, raw_elem, elem);
ret.push_back(elem); ret.set(i, elem);
} }
return ret; return ret;
@ -759,11 +764,12 @@ MonoArray *PoolVector2Array_to_mono_array(const PoolVector2Array &p_array) {
PoolVector2Array mono_array_to_PoolVector2Array(MonoArray *p_array) { PoolVector2Array mono_array_to_PoolVector2Array(MonoArray *p_array) {
PoolVector2Array ret; PoolVector2Array ret;
int length = mono_array_length(p_array); int length = mono_array_length(p_array);
ret.resize(length);
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
real_t *raw_elem = (real_t *)mono_array_addr_with_size(p_array, sizeof(real_t) * 2, i); real_t *raw_elem = (real_t *)mono_array_addr_with_size(p_array, sizeof(real_t) * 2, i);
MARSHALLED_IN(Vector2, raw_elem, elem); MARSHALLED_IN(Vector2, raw_elem, elem);
ret.push_back(elem); ret.set(i, elem);
} }
return ret; return ret;
@ -790,11 +796,12 @@ MonoArray *PoolVector3Array_to_mono_array(const PoolVector3Array &p_array) {
PoolVector3Array mono_array_to_PoolVector3Array(MonoArray *p_array) { PoolVector3Array mono_array_to_PoolVector3Array(MonoArray *p_array) {
PoolVector3Array ret; PoolVector3Array ret;
int length = mono_array_length(p_array); int length = mono_array_length(p_array);
ret.resize(length);
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
real_t *raw_elem = (real_t *)mono_array_addr_with_size(p_array, sizeof(real_t) * 3, i); real_t *raw_elem = (real_t *)mono_array_addr_with_size(p_array, sizeof(real_t) * 3, i);
MARSHALLED_IN(Vector3, raw_elem, elem); MARSHALLED_IN(Vector3, raw_elem, elem);
ret.push_back(elem); ret.set(i, elem);
} }
return ret; return ret;