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
73 lines
2.5 KiB
C
73 lines
2.5 KiB
C
/*
|
|
* Copyright 2011-2015 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.
|
|
*/
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
/* TODO(sergey): Think of making it more generic volume-type attribute
|
|
* sampler.
|
|
*/
|
|
ccl_device void svm_node_tex_voxel(KernelGlobals *kg,
|
|
ShaderData *sd,
|
|
float *stack,
|
|
uint4 node,
|
|
int *offset)
|
|
{
|
|
uint co_offset, density_out_offset, color_out_offset, space;
|
|
decode_node_uchar4(node.z, &co_offset, &density_out_offset, &color_out_offset, &space);
|
|
#ifdef __VOLUME__
|
|
int id = node.y;
|
|
float3 co = stack_load_float3(stack, co_offset);
|
|
if(space == NODE_TEX_VOXEL_SPACE_OBJECT) {
|
|
co = volume_normalized_position(kg, sd, co);
|
|
}
|
|
else {
|
|
kernel_assert(space == NODE_TEX_VOXEL_SPACE_WORLD);
|
|
Transform tfm;
|
|
tfm.x = read_node_float(kg, offset);
|
|
tfm.y = read_node_float(kg, offset);
|
|
tfm.z = read_node_float(kg, offset);
|
|
tfm.w = read_node_float(kg, offset);
|
|
co = transform_point(&tfm, co);
|
|
}
|
|
float4 r;
|
|
# if defined(__KERNEL_CUDA__)
|
|
# if __CUDA_ARCH__ >= 300
|
|
CUtexObject tex = kernel_tex_fetch(__bindless_mapping, id);
|
|
if(kernel_tex_type(id) == IMAGE_DATA_TYPE_FLOAT4 || kernel_tex_type(id) == IMAGE_DATA_TYPE_BYTE4 || kernel_tex_type(id) == IMAGE_DATA_TYPE_HALF4)
|
|
r = kernel_tex_image_interp_3d_float4(tex, co.x, co.y, co.z);
|
|
else {
|
|
float f = kernel_tex_image_interp_3d_float(tex, co.x, co.y, co.z);
|
|
r = make_float4(f, f, f, 1.0f);
|
|
}
|
|
# else /* __CUDA_ARCH__ >= 300 */
|
|
r = volume_image_texture_3d(id, co.x, co.y, co.z);
|
|
# endif
|
|
# elif defined(__KERNEL_OPENCL__)
|
|
r = kernel_tex_image_interp_3d(kg, id, co.x, co.y, co.z);
|
|
# else
|
|
r = kernel_tex_image_interp_3d(id, co.x, co.y, co.z);
|
|
# endif /* __KERNEL_CUDA__ */
|
|
#else
|
|
float4 r = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
|
|
#endif
|
|
if(stack_valid(density_out_offset))
|
|
stack_store_float(stack, density_out_offset, r.w);
|
|
if(stack_valid(color_out_offset))
|
|
stack_store_float3(stack, color_out_offset, make_float3(r.x, r.y, r.z));
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|