Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Cleanup, remove unused function

Browse Source
This commit is contained in:
Sergey Sharybin
2018-07-27 10:22:45 +02:00
parent e977fe985f
commit de80b928a3
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
intern/cycles/render/image.cpp
View File

@@ -229,15 +229,6 @@ bool ImageManager::get_image_metadata(const string& filename,
return true; return true;
} }
int ImageManager::max_flattened_slot(ImageDataType type)
{
if(tex_num_images[type] == 0) {
/* No textures for the type, no slots needs allocation. */
return 0;
}
return type_index_to_flattened_slot(tex_num_images[type], type);
}
/* The lower three bits of a device texture slot number indicate its type. /* The lower three bits of a device texture slot number indicate its type.
* These functions convert the slot ids from ImageManager "images" ones * These functions convert the slot ids from ImageManager "images" ones
* to device ones and vice verse. * to device ones and vice verse.

1
intern/cycles/render/image.h
View File

@@ -149,7 +149,6 @@ private:
int texture_limit, int texture_limit,
device_vector<DeviceType>& tex_img); device_vector<DeviceType>& tex_img);
int max_flattened_slot(ImageDataType type);
int type_index_to_flattened_slot(int slot, ImageDataType type); int type_index_to_flattened_slot(int slot, ImageDataType type);
int flattened_slot_to_type_index(int flat_slot, ImageDataType *type); int flattened_slot_to_type_index(int flat_slot, ImageDataType *type);
const char* name_from_type(ImageDataType type); const char* name_from_type(ImageDataType type);