Differential D317 Diff 1026 intern/cycles/render/image.cpp

Changeset View

Standalone View

intern/cycles/render/image.cpp

Context not available.
	return is_float;	return is_float;
	}	}

	int ImageManager::add_image(const string& filename, void *builtin_data, bool animated, bool& is_float, bool& is_linear)	int ImageManager::add_image(const string& filename, void *builtin_data, bool animated, bool& is_float, bool& is_linear, int interpolation)
	{	{
	Image *img;	Image *img;
	size_t slot;	size_t slot;
Context not available.
	if(is_float) {	if(is_float) {
	/* find existing image */	/* find existing image */
	for(slot = 0; slot < float_images.size(); slot++) {	for(slot = 0; slot < float_images.size(); slot++) {
	if(float_images[slot] && float_images[slot]->filename == filename) {	if(float_images[slot] && float_images[slot]->filename == filename && float_images[slot]->interpolation == interpolation) {
	float_images[slot]->users++;	float_images[slot]->users++;
	return slot;	return slot;
	}	}
Context not available.
	img->builtin_data = builtin_data;	img->builtin_data = builtin_data;
	img->need_load = true;	img->need_load = true;
	img->animated = animated;	img->animated = animated;
		img->interpolation = interpolation;
	img->users = 1;	img->users = 1;

	float_images[slot] = img;	float_images[slot] = img;
	}	}
	else {	else {
	for(slot = 0; slot < images.size(); slot++) {	for(slot = 0; slot < images.size(); slot++) {
	if(images[slot] && images[slot]->filename == filename) {	if(images[slot] && images[slot]->filename == filename && images[slot]->interpolation == interpolation) {
	images[slot]->users++;	images[slot]->users++;
	return slot+tex_image_byte_start;	return slot+tex_image_byte_start;
	}	}
Context not available.
	img->builtin_data = builtin_data;	img->builtin_data = builtin_data;
	img->need_load = true;	img->need_load = true;
	img->animated = animated;	img->animated = animated;
		img->interpolation = interpolation;
	img->users = 1;	img->users = 1;

	images[slot] = img;	images[slot] = img;
Context not available.
	return slot;	return slot;
	}	}

	void ImageManager::remove_image(const string& filename, void *builtin_data)	void ImageManager::remove_image(const string& filename, void *builtin_data, int interpolation)
	{	{
	size_t slot;	size_t slot;

	for(slot = 0; slot < images.size(); slot++) {	for(slot = 0; slot < images.size(); slot++) {
	if(images[slot] && images[slot]->filename == filename && images[slot]->builtin_data == builtin_data) {	if(images[slot] && images[slot]->filename == filename && images[slot]->interpolation == interpolation && images[slot]->builtin_data == builtin_data) {
	/* decrement user count */	/* decrement user count */
	images[slot]->users--;	images[slot]->users--;
	assert(images[slot]->users >= 0);	assert(images[slot]->users >= 0);
Context not available.
	if(slot == images.size()) {	if(slot == images.size()) {
	/* see if it's in a float texture slot */	/* see if it's in a float texture slot */
	for(slot = 0; slot < float_images.size(); slot++) {	for(slot = 0; slot < float_images.size(); slot++) {
	if(float_images[slot] && float_images[slot]->filename == filename && float_images[slot]->builtin_data == builtin_data) {	if(float_images[slot] && float_images[slot]->filename == filename
		&& float_images[slot]->interpolation == interpolation
		&& float_images[slot]->builtin_data == builtin_data) {
	/* decrement user count */	/* decrement user count */
	float_images[slot]->users--;	float_images[slot]->users--;
	assert(float_images[slot]->users >= 0);	assert(float_images[slot]->users >= 0);
Context not available.
	is_float = true;	is_float = true;
	}	}

		InterpolationType inter_type = img->interpolation == 1 ? INTERPOLATION_CLOSEST : INTERPOLATION_LINEAR;

	if(is_float) {	if(is_float) {
	string filename = path_filename(float_images[slot]->filename);	string filename = path_filename(float_images[slot]->filename);
	progress->set_status("Updating Images", "Loading " + filename);	progress->set_status("Updating Images", "Loading " + filename);
Context not available.

	if(!pack_images) {	if(!pack_images) {
	thread_scoped_lock device_lock(device_mutex);	thread_scoped_lock device_lock(device_mutex);
	device->tex_alloc(name.c_str(), tex_img, true, true);	device->tex_alloc(name.c_str(), tex_img, inter_type, true);
	}	}
	}	}
	else {	else {
Context not available.

	if(!pack_images) {	if(!pack_images) {
	thread_scoped_lock device_lock(device_mutex);	thread_scoped_lock device_lock(device_mutex);
	device->tex_alloc(name.c_str(), tex_img, true, true);	device->tex_alloc(name.c_str(), tex_img, inter_type, true);
	}	}
	}	}

Context not available.

	device_vector<uchar4>& tex_img = dscene->tex_image[slot];	device_vector<uchar4>& tex_img = dscene->tex_image[slot];

	info[slot] = make_uint4(tex_img.data_width, tex_img.data_height, offset, 1);	info[slot] = make_uint4(tex_img.data_width, tex_img.data_height, offset, 1 );

	memcpy(pixels+offset, (void*)tex_img.data_pointer, tex_img.memory_size());	memcpy(pixels+offset, (void*)tex_img.data_pointer, tex_img.memory_size());
		brechtUnsubmitted Not Done Inline Actions Better use `uint8_t` instead, that's the one we use elsewhere and ensure is available. brecht: Better use `uint8_t` instead, that's the one we use elsewhere and ensure is available.
	offset += tex_img.size();	offset += tex_img.size();
Context not available.