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

Cycles: Cleanup after recent refactor

Browse Source 
Wrong indentation, wrong spacing.
This commit is contained in:
Sergey Sharybin
2016-05-16 10:55:50 +02:00
parent f70b548630
commit 22d53e558d
1 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,13 +233,11 @@ int ImageManager::type_index_to_flattened_slot(int slot, ImageDataType type)
int ImageManager::flattened_slot_to_type_index(int flat_slot, ImageDataType *type) int ImageManager::flattened_slot_to_type_index(int flat_slot, ImageDataType *type)
{ {
if(flat_slot >= tex_image_byte_start) if(flat_slot >= tex_image_byte_start) {
{
*type = IMAGE_DATA_TYPE_BYTE; *type = IMAGE_DATA_TYPE_BYTE;
return flat_slot - tex_image_byte_start; return flat_slot - tex_image_byte_start;
} }
else if(flat_slot >= tex_image_float_start) else if(flat_slot >= tex_image_float_start) {
{
*type = IMAGE_DATA_TYPE_FLOAT; *type = IMAGE_DATA_TYPE_FLOAT;
return flat_slot - tex_image_float_start; return flat_slot - tex_image_float_start;
} }
@@ -306,10 +304,10 @@ int ImageManager::add_image(const string& filename,
for(slot = 0; slot < images[type].size(); slot++) { for(slot = 0; slot < images[type].size(); slot++) {
img = images[type][slot]; img = images[type][slot];
if(img && image_equals(img, if(img && image_equals(img,
filename, filename,
builtin_data, builtin_data,
interpolation, interpolation,
extension)) extension))
{ {
if(img->frame != frame) { if(img->frame != frame) {
img->frame = frame; img->frame = frame;
@@ -388,10 +386,10 @@ void ImageManager::remove_image(const string& filename,
for(int type = 0; type < IMAGE_DATA_NUM_TYPES; type++) { for(int type = 0; type < IMAGE_DATA_NUM_TYPES; type++) {
for(slot = 0; slot < images[type].size(); slot++) { for(slot = 0; slot < images[type].size(); slot++) {
if(images[type][slot] && image_equals(images[type][slot], if(images[type][slot] && image_equals(images[type][slot],
filename, filename,
builtin_data, builtin_data,
interpolation, interpolation,
extension)) extension))
{ {
remove_image(type_index_to_flattened_slot(slot, (ImageDataType)type)); remove_image(type_index_to_flattened_slot(slot, (ImageDataType)type));
return; return;
@@ -412,10 +410,10 @@ void ImageManager::tag_reload_image(const string& filename,
for(size_t type = 0; type < IMAGE_DATA_NUM_TYPES; type++) { for(size_t type = 0; type < IMAGE_DATA_NUM_TYPES; type++) {
for(size_t slot = 0; slot < images[type].size(); slot++) { for(size_t slot = 0; slot < images[type].size(); slot++) {
if(images[type][slot] && image_equals(images[type][slot], if(images[type][slot] && image_equals(images[type][slot],
filename, filename,
builtin_data, builtin_data,
interpolation, interpolation,
extension)) extension))
{ {
images[type][slot]->need_load = true; images[type][slot]->need_load = true;
break; break;
@@ -496,10 +494,10 @@ bool ImageManager::file_load_byte4_image(Image *img, device_vector<uchar4>& tex_
int scanlinesize = width*components*sizeof(uchar); int scanlinesize = width*components*sizeof(uchar);
in->read_image(TypeDesc::UINT8, in->read_image(TypeDesc::UINT8,
(uchar*)pixels + (((size_t)height)-1)*scanlinesize, (uchar*)pixels + (((size_t)height)-1)*scanlinesize,
AutoStride, AutoStride,
-scanlinesize, -scanlinesize,
AutoStride); AutoStride);
} }
else { else {
in->read_image(TypeDesc::UINT8, (uchar*)pixels); in->read_image(TypeDesc::UINT8, (uchar*)pixels);
@@ -580,10 +578,10 @@ bool ImageManager::file_load_byte_image(Image *img, device_vector<uchar>& tex_im
int scanlinesize = width*components*sizeof(uchar); int scanlinesize = width*components*sizeof(uchar);
in->read_image(TypeDesc::UINT8, in->read_image(TypeDesc::UINT8,
(uchar*)pixels + (((size_t)height)-1)*scanlinesize, (uchar*)pixels + (((size_t)height)-1)*scanlinesize,
AutoStride, AutoStride,
-scanlinesize, -scanlinesize,
AutoStride); AutoStride);
} }
else { else {
in->read_image(TypeDesc::UINT8, (uchar*)pixels); in->read_image(TypeDesc::UINT8, (uchar*)pixels);
@@ -627,10 +625,10 @@ bool ImageManager::file_load_float4_image(Image *img, device_vector<float4>& tex
int scanlinesize = width*components*sizeof(float); int scanlinesize = width*components*sizeof(float);
in->read_image(TypeDesc::FLOAT, in->read_image(TypeDesc::FLOAT,
(uchar*)readpixels + (height-1)*scanlinesize, (uchar*)readpixels + (height-1)*scanlinesize,
AutoStride, AutoStride,
-scanlinesize, -scanlinesize,
AutoStride); AutoStride);
} }
else { else {
in->read_image(TypeDesc::FLOAT, (uchar*)readpixels); in->read_image(TypeDesc::FLOAT, (uchar*)readpixels);
@@ -817,7 +815,7 @@ void ImageManager::device_load_image(Device *device, DeviceScene *dscene, ImageD
img->extension); img->extension);
} }
} }
else if(type == IMAGE_DATA_TYPE_BYTE4){ else if(type == IMAGE_DATA_TYPE_BYTE4) {
device_vector<uchar4>& tex_img = dscene->tex_byte4_image[slot]; device_vector<uchar4>& tex_img = dscene->tex_byte4_image[slot];
if(tex_img.device_pointer) { if(tex_img.device_pointer) {
@@ -901,7 +899,7 @@ void ImageManager::device_free_image(Device *device, DeviceScene *dscene, ImageD
tex_img.clear(); tex_img.clear();
} }
else if(type == IMAGE_DATA_TYPE_BYTE4){ else if(type == IMAGE_DATA_TYPE_BYTE4) {
device_vector<uchar4>& tex_img = dscene->tex_byte4_image[slot]; device_vector<uchar4>& tex_img = dscene->tex_byte4_image[slot];
if(tex_img.device_pointer) { if(tex_img.device_pointer) {