forked from bartvdbraak/blender
ec25060a05
This patch allows for an unlimited number of textures in Cycles where the hardware allows. It replaces a number static arrays with dynamic arrays and changes the way the flat_slot indices are calculated. Eventually, I'd like to get to a point where there are only flat slots left and textures off all kinds are stored in a single array. Note that the arrays in DeviceScene are changed from containing device_vector<T> objects to device_vector<T>* pointers. Ideally, I'd like to store objects, but dynamic resizing of a std:vector in pre-C++11 calls the copy constructor, which for a good reason is not implemented for device_vector. Once we require C++11 for Cycles builds, we can implement a move constructor for device_vector and store objects again. The limits for CUDA Fermi hardware still apply. Reviewers: tod_baudais, InsigMathK, dingto, #cycles Reviewed By: dingto, #cycles Subscribers: dingto, smellslikedonkey Differential Revision: https://developer.blender.org/D2650
87 lines
3.2 KiB
C
87 lines
3.2 KiB
C
/*
|
|
* Copyright 2011-2016 Blender Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef __KERNEL_CPU_IMAGE_H__
|
|
#define __KERNEL_CPU_IMAGE_H__
|
|
|
|
#ifdef __KERNEL_CPU__
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
ccl_device float4 kernel_tex_image_interp_impl(KernelGlobals *kg, int tex, float x, float y)
|
|
{
|
|
switch(kernel_tex_type(tex)) {
|
|
case IMAGE_DATA_TYPE_HALF:
|
|
return kg->texture_half_images[kernel_tex_index(tex)].interp(x, y);
|
|
case IMAGE_DATA_TYPE_BYTE:
|
|
return kg->texture_byte_images[kernel_tex_index(tex)].interp(x, y);
|
|
case IMAGE_DATA_TYPE_FLOAT:
|
|
return kg->texture_float_images[kernel_tex_index(tex)].interp(x, y);
|
|
case IMAGE_DATA_TYPE_HALF4:
|
|
return kg->texture_half4_images[kernel_tex_index(tex)].interp(x, y);
|
|
case IMAGE_DATA_TYPE_BYTE4:
|
|
return kg->texture_byte4_images[kernel_tex_index(tex)].interp(x, y);
|
|
case IMAGE_DATA_TYPE_FLOAT4:
|
|
default:
|
|
return kg->texture_float4_images[kernel_tex_index(tex)].interp(x, y);
|
|
}
|
|
}
|
|
|
|
ccl_device float4 kernel_tex_image_interp_3d_impl(KernelGlobals *kg, int tex, float x, float y, float z)
|
|
{
|
|
switch(kernel_tex_type(tex)) {
|
|
case IMAGE_DATA_TYPE_HALF:
|
|
return kg->texture_half_images[kernel_tex_index(tex)].interp_3d(x, y, z);
|
|
case IMAGE_DATA_TYPE_BYTE:
|
|
return kg->texture_byte_images[kernel_tex_index(tex)].interp_3d(x, y, z);
|
|
case IMAGE_DATA_TYPE_FLOAT:
|
|
return kg->texture_float_images[kernel_tex_index(tex)].interp_3d(x, y, z);
|
|
case IMAGE_DATA_TYPE_HALF4:
|
|
return kg->texture_half4_images[kernel_tex_index(tex)].interp_3d(x, y, z);
|
|
case IMAGE_DATA_TYPE_BYTE4:
|
|
return kg->texture_byte4_images[kernel_tex_index(tex)].interp_3d(x, y, z);
|
|
case IMAGE_DATA_TYPE_FLOAT4:
|
|
default:
|
|
return kg->texture_float4_images[kernel_tex_index(tex)].interp_3d(x, y, z);
|
|
}
|
|
}
|
|
|
|
ccl_device float4 kernel_tex_image_interp_3d_ex_impl(KernelGlobals *kg, int tex, float x, float y, float z, int interpolation)
|
|
{
|
|
switch(kernel_tex_type(tex)) {
|
|
case IMAGE_DATA_TYPE_HALF:
|
|
return kg->texture_half_images[kernel_tex_index(tex)].interp_3d_ex(x, y, z, interpolation);
|
|
case IMAGE_DATA_TYPE_BYTE:
|
|
return kg->texture_byte_images[kernel_tex_index(tex)].interp_3d_ex(x, y, z, interpolation);
|
|
case IMAGE_DATA_TYPE_FLOAT:
|
|
return kg->texture_float_images[kernel_tex_index(tex)].interp_3d_ex(x, y, z, interpolation);
|
|
case IMAGE_DATA_TYPE_HALF4:
|
|
return kg->texture_half4_images[kernel_tex_index(tex)].interp_3d_ex(x, y, z, interpolation);
|
|
case IMAGE_DATA_TYPE_BYTE4:
|
|
return kg->texture_byte4_images[kernel_tex_index(tex)].interp_3d_ex(x, y, z, interpolation);
|
|
case IMAGE_DATA_TYPE_FLOAT4:
|
|
default:
|
|
return kg->texture_float4_images[kernel_tex_index(tex)].interp_3d_ex(x, y, z, interpolation);
|
|
}
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|
|
|
|
#endif // __KERNEL_CPU__
|
|
|
|
|
|
#endif // __KERNEL_CPU_IMAGE_H__
|