Code refactor: device memory cleanups, preparing for mapped host memory.

6 files changed, 12 insertions, 12 deletions

diff --git a/intern/cycles/render/bake.cpp b/intern/cycles/render/bake.cpp
index 99f68b6aa00..bae72e67410 100644
--- a/intern/cycles/render/bake.cpp
+++ b/intern/cycles/render/bake.cpp
@@ -201,7 +201,7 @@ bool BakeManager::bake(Device *device, DeviceScene *dscene, Scene *scene, Progre
 		/* read result */
 		int k = 0;
 
-		float4 *offset = (float4*)d_output.data_pointer;
+		float4 *offset = d_output.data();
 
 		size_t depth = 4;
 		for(size_t i=shader_offset; i < (shader_offset + shader_size); i++) {
diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp
index 23125f66d66..ac675dc7b39 100644
--- a/intern/cycles/render/buffers.cpp
+++ b/intern/cycles/render/buffers.cpp
@@ -173,8 +173,8 @@ bool RenderBuffers::get_denoising_pass_rect(int offset, float exposure, int samp
 		/* Approximate variance as E[x^2] - 1/N * (E[x])^2, since online variance
 		 * update does not work efficiently with atomics in the kernel. */
 		int mean_offset = offset - components;
-		float *mean = (float*)buffer.data_pointer + mean_offset;
-		float *var = (float*)buffer.data_pointer + offset;
+		float *mean = buffer.data() + mean_offset;
+		float *var = buffer.data() + offset;
 		assert(mean_offset >= 0);
 
 		if(components == 1) {
@@ -194,7 +194,7 @@ bool RenderBuffers::get_denoising_pass_rect(int offset, float exposure, int samp
 		}
 	}
 	else {
-		float *in = (float*)buffer.data_pointer + offset;
+		float *in = buffer.data() + offset;
 
 		if(components == 1) {
 			for(int i = 0; i < size; i++, in += pass_stride, pixels++) {
@@ -228,7 +228,7 @@ bool RenderBuffers::get_pass_rect(PassType type, float exposure, int sample, int
 			continue;
 		}
 
-		float *in = (float*)buffer.data_pointer + pass_offset;
+		float *in = buffer.data() + pass_offset;
 		int pass_stride = params.get_passes_size();
 
 		float scale = (pass.filter)? 1.0f/(float)sample: 1.0f;
@@ -295,7 +295,7 @@ bool RenderBuffers::get_pass_rect(PassType type, float exposure, int sample, int
 					pass_offset += color_pass.components;
 				}
 
-				float *in_divide = (float*)buffer.data_pointer + pass_offset;
+				float *in_divide = buffer.data() + pass_offset;
 
 				for(int i = 0; i < size; i++, in += pass_stride, in_divide += pass_stride, pixels += 3) {
 					float3 f = make_float3(in[0], in[1], in[2]);
@@ -344,7 +344,7 @@ bool RenderBuffers::get_pass_rect(PassType type, float exposure, int sample, int
 					pass_offset += color_pass.components;
 				}
 
-				float *in_weight = (float*)buffer.data_pointer + pass_offset;
+				float *in_weight = buffer.data() + pass_offset;
 
 				for(int i = 0; i < size; i++, in += pass_stride, in_weight += pass_stride, pixels += 4) {
 					float4 f = make_float4(in[0], in[1], in[2], in[3]);
diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp
index 2ce65ec055f..d353709647d 100644
--- a/intern/cycles/render/light.cpp
+++ b/intern/cycles/render/light.cpp
@@ -79,7 +79,7 @@ static void shade_background_pixels(Device *device, DeviceScene *dscene, int res
 
 	d_input.free();
 
-	float4 *d_output_data = reinterpret_cast<float4*>(d_output.data_pointer);
+	float4 *d_output_data = d_output.data();
 
 	pixels.resize(width*height);
 
diff --git a/intern/cycles/render/mesh_displace.cpp b/intern/cycles/render/mesh_displace.cpp
index 1f5f0481dec..ad2a5713bcb 100644
--- a/intern/cycles/render/mesh_displace.cpp
+++ b/intern/cycles/render/mesh_displace.cpp
@@ -149,7 +149,7 @@ bool MeshManager::displace(Device *device, DeviceScene *dscene, Scene *scene, Me
 	done.resize(num_verts, false);
 	int k = 0;
 
-	float4 *offset = (float4*)d_output.data_pointer;
+	float4 *offset = d_output.data();
 
 	Attribute *attr_mP = mesh->attributes.find(ATTR_STD_MOTION_VERTEX_POSITION);
 	for(size_t i = 0; i < num_triangles; i++) {
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 57e44861e40..3b93b0c0d1e 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -589,7 +589,7 @@ void ObjectManager::device_update_flags(Device *,
 		return;
 
 	/* object info flag */
-	uint *object_flag = dscene->object_flag.get_data();
+	uint *object_flag = dscene->object_flag.data();
 
 	vector<Object *> volume_objects;
 	bool has_volume_objects = false;
@@ -647,7 +647,7 @@ void ObjectManager::device_update_patch_map_offsets(Device *, DeviceScene *dscen
 		return;
 	}
 
-	uint4* objects = (uint4*)dscene->objects.get_data();
+	uint4* objects = (uint4*)dscene->objects.data();
 
 	bool update = false;
 
diff --git a/intern/cycles/render/tables.cpp b/intern/cycles/render/tables.cpp
index 5cda977b7f1..651ae4e21a0 100644
--- a/intern/cycles/render/tables.cpp
+++ b/intern/cycles/render/tables.cpp
@@ -87,7 +87,7 @@ size_t LookupTables::add_table(DeviceScene *dscene, vector<float>& data)
 	}
 
 	/* copy table data and return offset */
-	float *dtable = dscene->lookup_table.get_data();
+	float *dtable = dscene->lookup_table.data();
 	memcpy(dtable + new_table.offset, &data[0], sizeof(float) * data.size());
 
 	return new_table.offset;