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

Cycles: Prepare for more image extension types support

Browse Source 
Basically just replace boolean periodic flag with extension type enum in the
device API.
This commit is contained in:
Sergey Sharybin
2015-07-28 13:51:10 +02:00
parent 29ebb56f4d
commit 3fba620858
10 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/kernels/cpu/kernel.cpp
View File

@@ -45,7 +45,7 @@ void kernel_tex_copy(KernelGlobals *kg,
size_t height,
size_t depth,
InterpolationType interpolation,
bool periodic)
ExtensionType extension)
{
if(0) {
}
@@ -71,7 +71,7 @@ void kernel_tex_copy(KernelGlobals *kg,
tex->data = (float4*)mem;
tex->dimensions_set(width, height, depth);
tex->interpolation = interpolation;
tex->periodic = periodic;
tex->extension = extension;
}
}
else if(strstr(name, "__tex_image")) {
@@ -87,7 +87,7 @@ void kernel_tex_copy(KernelGlobals *kg,
tex->data = (uchar4*)mem;
tex->dimensions_set(width, height, depth);
tex->interpolation = interpolation;
tex->periodic = periodic;
tex->extension = extension;
}
}
else