archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cycles: Adding native support for UINT16 textures.

Browse Source 
Textures in 16 bit integer format are sometimes used for displacement, bump and normal maps and can be exported by tools like Substance Painter. Without this patch, Cycles would promote those textures to single precision floating point, causing them to take up twice as much memory as needed.

Reviewers: #cycles, brecht, sergey

Reviewed By: #cycles, brecht, sergey

Subscribers: sergey, dingto, #cycles

Tags: #cycles

Differential Revision: https://developer.blender.org/D3523
This commit is contained in:
Stefan Werner
2018-07-05 12:37:52 +02:00
parent cd17b32583
commit 4d00e95ee3
13 changed files with 198 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
intern/cycles/kernel/kernels/opencl/kernel_opencl_image.h
View File

@@ -54,11 +54,23 @@ ccl_device_inline float4 svm_image_texture_read(KernelGlobals *kg, const ccl_glo
float f = 1.0f/255.0f;
return make_float4(r.x*f, r.y*f, r.z*f, r.w*f);
}
/* Ushort4 */
else if(texture_type == IMAGE_DATA_TYPE_USHORT4) {
ushort4 r = tex_fetch(ushort4, info, offset);
float f = 1.0f/65535.f;
return make_float4(r.x*f, r.y*f, r.z*f, r.w*f);
}
/* Float */
else if(texture_type == IMAGE_DATA_TYPE_FLOAT) {
float f = tex_fetch(float, info, offset);
return make_float4(f, f, f, 1.0f);
}
/* UShort */
else if(texture_type == IMAGE_DATA_TYPE_USHORT) {
ushort r = tex_fetch(ushort, info, offset);
float f = r * (1.0f / 65535.0f);
return make_float4(f, f, f, 1.0f);
}
/* Byte */
else {
uchar r = tex_fetch(uchar, info, offset);