Differential D317 Diff 1163 intern/cycles/device/device_opencl.cpp

Changeset View

Standalone View

intern/cycles/device/device_opencl.cpp

Show First 20 Lines • Show All 875 Lines • ▼ Show 20 Lines	void const_copy_to(const char name, void host, size_t size)
else {		else {
device_vector<uchar> *data = i->second;		device_vector<uchar> *data = i->second;
data->copy((uchar*)host, size);		data->copy((uchar*)host, size);
}		}

mem_copy_to(*i->second);		mem_copy_to(*i->second);
}		}

void tex_alloc(const char *name, device_memory& mem, bool interpolation, bool periodic)		void tex_alloc(const char *name, device_memory& mem, InterpolationType interpolation, bool periodic)
{		{
mem_alloc(mem, MEM_READ_ONLY);		mem_alloc(mem, MEM_READ_ONLY);
mem_copy_to(mem);		mem_copy_to(mem);
assert(mem_map.find(name) == mem_map.end());		assert(mem_map.find(name) == mem_map.end());
mem_map.insert(MemMap::value_type(name, mem.device_pointer));		mem_map.insert(MemMap::value_type(name, mem.device_pointer));
}		}
		dingtoUnsubmitted Not Done Inline Actions Newline not needed. dingto: Newline not needed.

void tex_free(device_memory& mem)		void tex_free(device_memory& mem)
{		{
if(mem.device_pointer) {		if(mem.device_pointer) {
		brechtUnsubmitted Not Done Inline Actions Why is this needed? Is it when you have a texture with the same name but different interpolation? We should be able to handle that case correctly. brecht: Why is this needed? Is it when you have a texture with the same name but different…
		juicyfruitAuthorUnsubmitted Not Done Inline Actions Changing the interpolation changes the texture map and that reallocates the texture that holds all the image textures. But the map we keep is not designed for that and that will hit the assert and fail. I think it can be done better juicyfruit: Changing the interpolation changes the texture map and that reallocates the texture that holds…
foreach(const MemMap::value_type& value, mem_map) {		foreach(const MemMap::value_type& value, mem_map) {
if(value.second == mem.device_pointer) {		if(value.second == mem.device_pointer) {
mem_map.erase(value.first);		mem_map.erase(value.first);
break;		break;
}		}
}		}

mem_free(mem);		mem_free(mem);
▲ Show 20 Lines • Show All 292 Lines • Show Last 20 Lines