[Bf-blender-cvs] [7be6dba] master: Cycles: Implement reseve() for aligned array class

[Sergey Sharybin]

Commit: 7be6dba091d600c0a4fd327cebe9651721e1307b
Author: Sergey Sharybin
Date:   Sun Aug 23 15:50:31 2015 +0200
Branches: master
https://developer.blender.org/rB7be6dba091d600c0a4fd327cebe9651721e1307b

Cycles: Implement reseve() for aligned array class

The title says it all actually, just support reserving memory in the array class.

===================================================================

M	intern/cycles/util/util_vector.h

===================================================================

diff --git a/intern/cycles/util/util_vector.h b/intern/cycles/util/util_vector.h
index 15a65be..ee1f997 100644
--- a/intern/cycles/util/util_vector.h
+++ b/intern/cycles/util/util_vector.h
@@ -105,6 +105,7 @@ public:
 	{
 		data = NULL;
 		datasize = 0;
+		capacity = 0;
 	}
 
 	array(size_t newsize)
@@ -112,10 +113,12 @@ public:
 		if(newsize == 0) {
 			data = NULL;
 			datasize = 0;
+			capacity = 0;
 		}
 		else {
 			data = (T*)util_aligned_malloc(sizeof(T)*newsize, alignment);
 			datasize = newsize;
+			capacity = datasize;
 		}
 	}
 
@@ -129,11 +132,13 @@ public:
 		if(from.datasize == 0) {
 			data = NULL;
 			datasize = 0;
+			capacity = 0;
 		}
 		else {
 			data = (T*)util_aligned_malloc(sizeof(T)*from.datasize, alignment);
 			memcpy(data, from.data, from.datasize*sizeof(T));
 			datasize = from.datasize;
+			capacity = datasize;
 		}
 
 		return *this;
@@ -142,6 +147,7 @@ public:
 	array& operator=(const vector<T>& from)
 	{
 		datasize = from.size();
+		capacity = datasize;
 		data = NULL;
 
 		if(datasize > 0) {
@@ -163,13 +169,15 @@ public:
 			clear();
 		}
 		else if(newsize != datasize) {
-			T *newdata = (T*)util_aligned_malloc(sizeof(T)*newsize, alignment);
-			if(data) {
-				memcpy(newdata, data, ((datasize < newsize)? datasize: newsize)*sizeof(T));
-				util_aligned_free(data);
+			if(newsize > capacity) {
+				T *newdata = (T*)util_aligned_malloc(sizeof(T)*newsize, alignment);
+				if(data) {
+					memcpy(newdata, data, ((datasize < newsize)? datasize: newsize)*sizeof(T));
+					util_aligned_free(data);
+				}
+				data = newdata;
+				capacity = newsize;
 			}
-
-			data = newdata;
 			datasize = newsize;
 		}
 	}
@@ -179,6 +187,7 @@ public:
 		util_aligned_free(data);
 		data = NULL;
 		datasize = 0;
+		capacity = 0;
 	}
 
 	size_t size() const
@@ -192,9 +201,22 @@ public:
 		return data[i];
 	}
 
+	void reserve(size_t newcapacity) {
+		if(newcapacity > capacity) {
+			T *newdata = (T*)util_aligned_malloc(sizeof(T)*newcapacity, alignment);
+			if(data) {
+				memcpy(newdata, data, ((datasize < newcapacity)? datasize: newcapacity)*sizeof(T));
+				util_aligned_free(data);
+			}
+			data = newdata;
+			capacity = newcapacity;
+		}
+	}
+
 protected:
 	T *data;
 	size_t datasize;
+	size_t capacity;
 };
 
 CCL_NAMESPACE_END