diff options
Diffstat (limited to 'intern/cycles/device')
43 files changed, 175 insertions, 183 deletions
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt index 6d33a6f107f..99b1fc8135d 100644 --- a/intern/cycles/device/CMakeLists.txt +++ b/intern/cycles/device/CMakeLists.txt @@ -45,11 +45,11 @@ endif() set(SRC device.cpp - device_denoise.cpp - device_graphics_interop.cpp - device_kernel.cpp - device_memory.cpp - device_queue.cpp + denoise.cpp + graphics_interop.cpp + kernel.cpp + memory.cpp + queue.cpp ) set(SRC_CPU @@ -116,11 +116,11 @@ set(SRC_OPTIX set(SRC_HEADERS device.h - device_denoise.h - device_graphics_interop.h - device_memory.h - device_kernel.h - device_queue.h + denoise.h + graphics_interop.h + memory.h + kernel.h + queue.h ) set(LIB @@ -158,9 +158,6 @@ endif() if(WITH_CYCLES_DEVICE_OPTIX) add_definitions(-DWITH_OPTIX) endif() -if(WITH_CYCLES_DEVICE_MULTI) - add_definitions(-DWITH_MULTI) -endif() if(WITH_OPENIMAGEDENOISE) list(APPEND LIB diff --git a/intern/cycles/device/cpu/device.cpp b/intern/cycles/device/cpu/device.cpp index 68ca8e8bb22..f11b49ef65f 100644 --- a/intern/cycles/device/cpu/device.cpp +++ b/intern/cycles/device/cpu/device.cpp @@ -20,7 +20,7 @@ /* Used for `info.denoisers`. */ /* TODO(sergey): The denoisers are probably to be moved completely out of the device into their * own class. But until then keep API consistent with how it used to work before. */ -#include "util/util_openimagedenoise.h" +#include "util/openimagedenoise.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/cpu/device.h b/intern/cycles/device/cpu/device.h index 9cb2e80068d..c53bc338127 100644 --- a/intern/cycles/device/cpu/device.h +++ b/intern/cycles/device/cpu/device.h @@ -16,8 +16,8 @@ #pragma once -#include "util/util_string.h" -#include "util/util_vector.h" +#include "util/string.h" +#include "util/vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/cpu/device_impl.cpp b/intern/cycles/device/cpu/device_impl.cpp index d02c18daee9..dbad332f896 100644 --- a/intern/cycles/device/cpu/device_impl.cpp +++ b/intern/cycles/device/cpu/device_impl.cpp @@ -22,7 +22,7 @@ /* So ImathMath is included before our kernel_cpu_compat. */ #ifdef WITH_OSL /* So no context pollution happens from indirectly included windows.h */ -# include "util/util_windows.h" +# include "util/windows.h" # include <OSL/oslexec.h> #endif @@ -39,27 +39,27 @@ #include "kernel/device/cpu/compat.h" #include "kernel/device/cpu/globals.h" #include "kernel/device/cpu/kernel.h" -#include "kernel/kernel_types.h" +#include "kernel/types.h" -#include "kernel/osl/osl_shader.h" -#include "kernel/osl/osl_globals.h" +#include "kernel/osl/shader.h" +#include "kernel/osl/globals.h" // clang-format on -#include "bvh/bvh_embree.h" - -#include "render/buffers.h" - -#include "util/util_debug.h" -#include "util/util_foreach.h" -#include "util/util_function.h" -#include "util/util_logging.h" -#include "util/util_map.h" -#include "util/util_openimagedenoise.h" -#include "util/util_optimization.h" -#include "util/util_progress.h" -#include "util/util_system.h" -#include "util/util_task.h" -#include "util/util_thread.h" +#include "bvh/embree.h" + +#include "session/buffers.h" + +#include "util/debug.h" +#include "util/foreach.h" +#include "util/function.h" +#include "util/log.h" +#include "util/map.h" +#include "util/openimagedenoise.h" +#include "util/optimization.h" +#include "util/progress.h" +#include "util/system.h" +#include "util/task.h" +#include "util/thread.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/cpu/device_impl.h b/intern/cycles/device/cpu/device_impl.h index 944c61e29f7..553728ccc3b 100644 --- a/intern/cycles/device/cpu/device_impl.h +++ b/intern/cycles/device/cpu/device_impl.h @@ -19,7 +19,7 @@ /* So ImathMath is included before our kernel_cpu_compat. */ #ifdef WITH_OSL /* So no context pollution happens from indirectly included windows.h */ -# include "util/util_windows.h" +# include "util/windows.h" # include <OSL/oslexec.h> #endif @@ -29,15 +29,15 @@ #include "device/cpu/kernel.h" #include "device/device.h" -#include "device/device_memory.h" +#include "device/memory.h" // clang-format off #include "kernel/device/cpu/compat.h" #include "kernel/device/cpu/kernel.h" #include "kernel/device/cpu/globals.h" -#include "kernel/osl/osl_shader.h" -#include "kernel/osl/osl_globals.h" +#include "kernel/osl/shader.h" +#include "kernel/osl/globals.h" // clang-format on CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/cpu/kernel.h b/intern/cycles/device/cpu/kernel.h index 5f9cb85389f..5beeaf148a1 100644 --- a/intern/cycles/device/cpu/kernel.h +++ b/intern/cycles/device/cpu/kernel.h @@ -17,7 +17,7 @@ #pragma once #include "device/cpu/kernel_function.h" -#include "util/util_types.h" +#include "util/types.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/cpu/kernel_function.h b/intern/cycles/device/cpu/kernel_function.h index aa18720cc24..5ff55499d48 100644 --- a/intern/cycles/device/cpu/kernel_function.h +++ b/intern/cycles/device/cpu/kernel_function.h @@ -16,8 +16,8 @@ #pragma once -#include "util/util_debug.h" -#include "util/util_system.h" +#include "util/debug.h" +#include "util/system.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/cpu/kernel_thread_globals.cpp b/intern/cycles/device/cpu/kernel_thread_globals.cpp index 44735beb88d..739b6460318 100644 --- a/intern/cycles/device/cpu/kernel_thread_globals.cpp +++ b/intern/cycles/device/cpu/kernel_thread_globals.cpp @@ -17,11 +17,11 @@ #include "device/cpu/kernel_thread_globals.h" // clang-format off -#include "kernel/osl/osl_shader.h" -#include "kernel/osl/osl_globals.h" +#include "kernel/osl/shader.h" +#include "kernel/osl/globals.h" // clang-format on -#include "util/util_profiling.h" +#include "util/profiling.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/cuda/device.cpp b/intern/cycles/device/cuda/device.cpp index 84becd6d081..af2bdc6e29c 100644 --- a/intern/cycles/device/cuda/device.cpp +++ b/intern/cycles/device/cuda/device.cpp @@ -16,14 +16,14 @@ #include "device/cuda/device.h" -#include "util/util_logging.h" +#include "util/log.h" #ifdef WITH_CUDA # include "device/cuda/device_impl.h" # include "device/device.h" -# include "util/util_string.h" -# include "util/util_windows.h" +# include "util/string.h" +# include "util/windows.h" #endif /* WITH_CUDA */ CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/cuda/device.h b/intern/cycles/device/cuda/device.h index b0484904d1a..7142ad19857 100644 --- a/intern/cycles/device/cuda/device.h +++ b/intern/cycles/device/cuda/device.h @@ -16,8 +16,8 @@ #pragma once -#include "util/util_string.h" -#include "util/util_vector.h" +#include "util/string.h" +#include "util/vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/cuda/device_impl.cpp b/intern/cycles/device/cuda/device_impl.cpp index 1c970096801..2f9a1394ad8 100644 --- a/intern/cycles/device/cuda/device_impl.cpp +++ b/intern/cycles/device/cuda/device_impl.cpp @@ -24,19 +24,17 @@ # include "device/cuda/device_impl.h" -# include "render/buffers.h" - -# include "util/util_debug.h" -# include "util/util_foreach.h" -# include "util/util_logging.h" -# include "util/util_map.h" -# include "util/util_md5.h" -# include "util/util_path.h" -# include "util/util_string.h" -# include "util/util_system.h" -# include "util/util_time.h" -# include "util/util_types.h" -# include "util/util_windows.h" +# include "util/debug.h" +# include "util/foreach.h" +# include "util/log.h" +# include "util/map.h" +# include "util/md5.h" +# include "util/path.h" +# include "util/string.h" +# include "util/system.h" +# include "util/time.h" +# include "util/types.h" +# include "util/windows.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/cuda/device_impl.h b/intern/cycles/device/cuda/device_impl.h index c0316d18ba0..72d4108d1bf 100644 --- a/intern/cycles/device/cuda/device_impl.h +++ b/intern/cycles/device/cuda/device_impl.h @@ -21,7 +21,7 @@ # include "device/cuda/util.h" # include "device/device.h" -# include "util/util_map.h" +# include "util/map.h" # ifdef WITH_CUDA_DYNLOAD # include "cuew.h" diff --git a/intern/cycles/device/cuda/graphics_interop.h b/intern/cycles/device/cuda/graphics_interop.h index ec480f20c86..a00a837efea 100644 --- a/intern/cycles/device/cuda/graphics_interop.h +++ b/intern/cycles/device/cuda/graphics_interop.h @@ -16,7 +16,7 @@ #ifdef WITH_CUDA -# include "device/device_graphics_interop.h" +# include "device/graphics_interop.h" # ifdef WITH_CUDA_DYNLOAD # include "cuew.h" diff --git a/intern/cycles/device/cuda/kernel.h b/intern/cycles/device/cuda/kernel.h index b489547a350..e1650ea5b5b 100644 --- a/intern/cycles/device/cuda/kernel.h +++ b/intern/cycles/device/cuda/kernel.h @@ -18,7 +18,7 @@ #ifdef WITH_CUDA -# include "device/device_kernel.h" +# include "device/kernel.h" # ifdef WITH_CUDA_DYNLOAD # include "cuew.h" diff --git a/intern/cycles/device/cuda/queue.h b/intern/cycles/device/cuda/queue.h index 4d1995ed69e..28613cda071 100644 --- a/intern/cycles/device/cuda/queue.h +++ b/intern/cycles/device/cuda/queue.h @@ -18,9 +18,9 @@ #ifdef WITH_CUDA -# include "device/device_kernel.h" -# include "device/device_memory.h" -# include "device/device_queue.h" +# include "device/kernel.h" +# include "device/memory.h" +# include "device/queue.h" # include "device/cuda/util.h" diff --git a/intern/cycles/device/device_denoise.cpp b/intern/cycles/device/denoise.cpp index aea7868f65d..c291a7a0adb 100644 --- a/intern/cycles/device/device_denoise.cpp +++ b/intern/cycles/device/denoise.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/device_denoise.h" +#include "device/denoise.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/device_denoise.h b/intern/cycles/device/denoise.h index dfdc7cc87b3..3f30506ae06 100644 --- a/intern/cycles/device/device_denoise.h +++ b/intern/cycles/device/denoise.h @@ -16,9 +16,9 @@ #pragma once -#include "device/device_memory.h" +#include "device/memory.h" #include "graph/node.h" -#include "render/buffers.h" +#include "session/buffers.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 81574e8b184..69e959b6f7b 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -20,7 +20,7 @@ #include "bvh/bvh2.h" #include "device/device.h" -#include "device/device_queue.h" +#include "device/queue.h" #include "device/cpu/device.h" #include "device/cuda/device.h" @@ -29,15 +29,15 @@ #include "device/multi/device.h" #include "device/optix/device.h" -#include "util/util_foreach.h" -#include "util/util_half.h" -#include "util/util_logging.h" -#include "util/util_math.h" -#include "util/util_string.h" -#include "util/util_system.h" -#include "util/util_time.h" -#include "util/util_types.h" -#include "util/util_vector.h" +#include "util/foreach.h" +#include "util/half.h" +#include "util/log.h" +#include "util/math.h" +#include "util/string.h" +#include "util/system.h" +#include "util/time.h" +#include "util/types.h" +#include "util/vector.h" CCL_NAMESPACE_BEGIN @@ -71,14 +71,12 @@ void Device::build_bvh(BVH *bvh, Progress &progress, bool refit) Device *Device::create(const DeviceInfo &info, Stats &stats, Profiler &profiler) { -#ifdef WITH_MULTI if (!info.multi_devices.empty()) { /* Always create a multi device when info contains multiple devices. * This is done so that the type can still be e.g. DEVICE_CPU to indicate * that it is a homogeneous collection of devices, which simplifies checks. */ return device_multi_create(info, stats, profiler); } -#endif Device *device = NULL; diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index c73d74cdccc..3cb177adde7 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -19,21 +19,21 @@ #include <stdlib.h> -#include "bvh/bvh_params.h" - -#include "device/device_denoise.h" -#include "device/device_memory.h" - -#include "util/util_function.h" -#include "util/util_list.h" -#include "util/util_logging.h" -#include "util/util_stats.h" -#include "util/util_string.h" -#include "util/util_texture.h" -#include "util/util_thread.h" -#include "util/util_types.h" -#include "util/util_unique_ptr.h" -#include "util/util_vector.h" +#include "bvh/params.h" + +#include "device/denoise.h" +#include "device/memory.h" + +#include "util/function.h" +#include "util/list.h" +#include "util/log.h" +#include "util/stats.h" +#include "util/string.h" +#include "util/texture.h" +#include "util/thread.h" +#include "util/types.h" +#include "util/unique_ptr.h" +#include "util/vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/dummy/device.cpp b/intern/cycles/device/dummy/device.cpp index e3cea272300..64f6b0eb58c 100644 --- a/intern/cycles/device/dummy/device.cpp +++ b/intern/cycles/device/dummy/device.cpp @@ -17,7 +17,7 @@ #include "device/dummy/device.h" #include "device/device.h" -#include "device/device_queue.h" +#include "device/queue.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/dummy/device.h b/intern/cycles/device/dummy/device.h index 832a9568129..c45eb036ca5 100644 --- a/intern/cycles/device/dummy/device.h +++ b/intern/cycles/device/dummy/device.h @@ -16,8 +16,8 @@ #pragma once -#include "util/util_string.h" -#include "util/util_vector.h" +#include "util/string.h" +#include "util/vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/device_graphics_interop.cpp b/intern/cycles/device/graphics_interop.cpp index a80a236759f..0b092711b61 100644 --- a/intern/cycles/device/device_graphics_interop.cpp +++ b/intern/cycles/device/graphics_interop.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/device_graphics_interop.h" +#include "device/graphics_interop.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/device_graphics_interop.h b/intern/cycles/device/graphics_interop.h index eaf76077141..f1661146ddd 100644 --- a/intern/cycles/device/device_graphics_interop.h +++ b/intern/cycles/device/graphics_interop.h @@ -16,9 +16,9 @@ #pragma once -#include "render/display_driver.h" +#include "session/display_driver.h" -#include "util/util_types.h" +#include "util/types.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/hip/device.cpp b/intern/cycles/device/hip/device.cpp index 90028ac7f10..f71732d14bb 100644 --- a/intern/cycles/device/hip/device.cpp +++ b/intern/cycles/device/hip/device.cpp @@ -16,14 +16,14 @@ #include "device/hip/device.h" -#include "util/util_logging.h" +#include "util/log.h" #ifdef WITH_HIP # include "device/device.h" # include "device/hip/device_impl.h" -# include "util/util_string.h" -# include "util/util_windows.h" +# include "util/string.h" +# include "util/windows.h" #endif /* WITH_HIP */ CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/hip/device.h b/intern/cycles/device/hip/device.h index 965fd9e484b..cdbe364b2b3 100644 --- a/intern/cycles/device/hip/device.h +++ b/intern/cycles/device/hip/device.h @@ -16,8 +16,8 @@ #pragma once -#include "util/util_string.h" -#include "util/util_vector.h" +#include "util/string.h" +#include "util/vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/hip/device_impl.cpp b/intern/cycles/device/hip/device_impl.cpp index 4ae714913ab..31b7b07383b 100644 --- a/intern/cycles/device/hip/device_impl.cpp +++ b/intern/cycles/device/hip/device_impl.cpp @@ -24,20 +24,18 @@ # include "device/hip/device_impl.h" -# include "render/buffers.h" - -# include "util/util_debug.h" -# include "util/util_foreach.h" -# include "util/util_logging.h" -# include "util/util_map.h" -# include "util/util_md5.h" -# include "util/util_opengl.h" -# include "util/util_path.h" -# include "util/util_string.h" -# include "util/util_system.h" -# include "util/util_time.h" -# include "util/util_types.h" -# include "util/util_windows.h" +# include "util/debug.h" +# include "util/foreach.h" +# include "util/log.h" +# include "util/map.h" +# include "util/md5.h" +# include "util/opengl.h" +# include "util/path.h" +# include "util/string.h" +# include "util/system.h" +# include "util/time.h" +# include "util/types.h" +# include "util/windows.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/hip/device_impl.h b/intern/cycles/device/hip/device_impl.h index 1d138ee9856..8d81291d15e 100644 --- a/intern/cycles/device/hip/device_impl.h +++ b/intern/cycles/device/hip/device_impl.h @@ -21,12 +21,12 @@ # include "device/hip/queue.h" # include "device/hip/util.h" -# include "util/util_map.h" +# include "util/map.h" # ifdef WITH_HIP_DYNLOAD # include "hipew.h" # else -# include "util/util_opengl.h" +# include "util/opengl.h" # endif CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/hip/graphics_interop.h b/intern/cycles/device/hip/graphics_interop.h index 2b2d287ff6c..8314405e670 100644 --- a/intern/cycles/device/hip/graphics_interop.h +++ b/intern/cycles/device/hip/graphics_interop.h @@ -16,7 +16,7 @@ #ifdef WITH_HIP -# include "device/device_graphics_interop.h" +# include "device/graphics_interop.h" # ifdef WITH_HIP_DYNLOAD # include "hipew.h" diff --git a/intern/cycles/device/hip/kernel.h b/intern/cycles/device/hip/kernel.h index 3301731f56e..f1378f8eebf 100644 --- a/intern/cycles/device/hip/kernel.h +++ b/intern/cycles/device/hip/kernel.h @@ -18,7 +18,7 @@ #ifdef WITH_HIP -# include "device/device_kernel.h" +# include "device/kernel.h" # ifdef WITH_HIP_DYNLOAD # include "hipew.h" diff --git a/intern/cycles/device/hip/queue.h b/intern/cycles/device/hip/queue.h index b92f7de7e4b..95d1afaff0f 100644 --- a/intern/cycles/device/hip/queue.h +++ b/intern/cycles/device/hip/queue.h @@ -18,9 +18,9 @@ #ifdef WITH_HIP -# include "device/device_kernel.h" -# include "device/device_memory.h" -# include "device/device_queue.h" +# include "device/kernel.h" +# include "device/memory.h" +# include "device/queue.h" # include "device/hip/util.h" diff --git a/intern/cycles/device/device_kernel.cpp b/intern/cycles/device/kernel.cpp index 1e282aac57e..1e4f0c48f18 100644 --- a/intern/cycles/device/device_kernel.cpp +++ b/intern/cycles/device/kernel.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "device/device_kernel.h" +#include "device/kernel.h" -#include "util/util_logging.h" +#include "util/log.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/device_kernel.h b/intern/cycles/device/kernel.h index 83d959ca87b..780ead2d28a 100644 --- a/intern/cycles/device/device_kernel.h +++ b/intern/cycles/device/kernel.h @@ -16,9 +16,9 @@ #pragma once -#include "kernel/kernel_types.h" +#include "kernel/types.h" -#include "util/util_string.h" +#include "util/string.h" #include <ostream> // NOLINT diff --git a/intern/cycles/device/device_memory.cpp b/intern/cycles/device/memory.cpp index c0ab2e17cae..f162b00d9f7 100644 --- a/intern/cycles/device/device_memory.cpp +++ b/intern/cycles/device/memory.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/device_memory.h" +#include "device/memory.h" #include "device/device.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/device_memory.h b/intern/cycles/device/memory.h index be6123e09b2..281c54cc6a5 100644 --- a/intern/cycles/device/device_memory.h +++ b/intern/cycles/device/memory.h @@ -21,12 +21,12 @@ * * Data types for allocating, copying and freeing device memory. */ -#include "util/util_array.h" -#include "util/util_half.h" -#include "util/util_string.h" -#include "util/util_texture.h" -#include "util/util_types.h" -#include "util/util_vector.h" +#include "util/array.h" +#include "util/half.h" +#include "util/string.h" +#include "util/texture.h" +#include "util/types.h" +#include "util/vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/multi/device.cpp b/intern/cycles/device/multi/device.cpp index 4f995abf2c4..56efec3e131 100644 --- a/intern/cycles/device/multi/device.cpp +++ b/intern/cycles/device/multi/device.cpp @@ -19,19 +19,18 @@ #include <sstream> #include <stdlib.h> -#include "bvh/bvh_multi.h" +#include "bvh/multi.h" #include "device/device.h" -#include "device/device_queue.h" +#include "device/queue.h" -#include "render/buffers.h" -#include "render/geometry.h" +#include "scene/geometry.h" -#include "util/util_foreach.h" -#include "util/util_list.h" -#include "util/util_logging.h" -#include "util/util_map.h" -#include "util/util_time.h" +#include "util/foreach.h" +#include "util/list.h" +#include "util/log.h" +#include "util/map.h" +#include "util/time.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/multi/device.h b/intern/cycles/device/multi/device.h index 6e121014a1f..ac77f6574ef 100644 --- a/intern/cycles/device/multi/device.h +++ b/intern/cycles/device/multi/device.h @@ -16,8 +16,8 @@ #pragma once -#include "util/util_string.h" -#include "util/util_vector.h" +#include "util/string.h" +#include "util/vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/optix/device.cpp b/intern/cycles/device/optix/device.cpp index 13f23bd229a..a00169e719f 100644 --- a/intern/cycles/device/optix/device.cpp +++ b/intern/cycles/device/optix/device.cpp @@ -19,7 +19,8 @@ #include "device/cuda/device.h" #include "device/optix/device_impl.h" -#include "util/util_logging.h" + +#include "util/log.h" #ifdef WITH_OPTIX # include <optix_function_table_definition.h> diff --git a/intern/cycles/device/optix/device.h b/intern/cycles/device/optix/device.h index 29fa729c2e4..dd60a7aa6e2 100644 --- a/intern/cycles/device/optix/device.h +++ b/intern/cycles/device/optix/device.h @@ -16,8 +16,8 @@ #pragma once -#include "util/util_string.h" -#include "util/util_vector.h" +#include "util/string.h" +#include "util/vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/optix/device_impl.cpp b/intern/cycles/device/optix/device_impl.cpp index 29e46be7745..e9164cc0a76 100644 --- a/intern/cycles/device/optix/device_impl.cpp +++ b/intern/cycles/device/optix/device_impl.cpp @@ -20,21 +20,22 @@ # include "device/optix/device_impl.h" # include "bvh/bvh.h" -# include "bvh/bvh_optix.h" +# include "bvh/optix.h" + # include "integrator/pass_accessor_gpu.h" -# include "render/buffers.h" -# include "render/hair.h" -# include "render/mesh.h" -# include "render/object.h" -# include "render/pass.h" -# include "render/scene.h" - -# include "util/util_debug.h" -# include "util/util_logging.h" -# include "util/util_md5.h" -# include "util/util_path.h" -# include "util/util_progress.h" -# include "util/util_time.h" + +# include "scene/hair.h" +# include "scene/mesh.h" +# include "scene/object.h" +# include "scene/pass.h" +# include "scene/scene.h" + +# include "util/debug.h" +# include "util/log.h" +# include "util/md5.h" +# include "util/path.h" +# include "util/progress.h" +# include "util/time.h" # undef __KERNEL_CPU__ # define __KERNEL_OPTIX__ @@ -1573,7 +1574,7 @@ void OptiXDevice::const_copy_to(const char *name, void *host, size_t size) return; \ } KERNEL_TEX(IntegratorStateGPU, __integrator_state) -# include "kernel/kernel_textures.h" +# include "kernel/textures.h" # undef KERNEL_TEX } diff --git a/intern/cycles/device/optix/device_impl.h b/intern/cycles/device/optix/device_impl.h index b20d42f8c61..3ec98098eb7 100644 --- a/intern/cycles/device/optix/device_impl.h +++ b/intern/cycles/device/optix/device_impl.h @@ -22,7 +22,7 @@ # include "device/cuda/device_impl.h" # include "device/optix/queue.h" # include "device/optix/util.h" -# include "kernel/kernel_types.h" +# include "kernel/types.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/optix/queue.cpp b/intern/cycles/device/optix/queue.cpp index 458ed70baa8..f5bfd916ccf 100644 --- a/intern/cycles/device/optix/queue.cpp +++ b/intern/cycles/device/optix/queue.cpp @@ -19,7 +19,7 @@ # include "device/optix/queue.h" # include "device/optix/device_impl.h" -# include "util/util_time.h" +# include "util/time.h" # undef __KERNEL_CPU__ # define __KERNEL_OPTIX__ diff --git a/intern/cycles/device/device_queue.cpp b/intern/cycles/device/queue.cpp index f2b2f3496e0..556dc97f23b 100644 --- a/intern/cycles/device/device_queue.cpp +++ b/intern/cycles/device/queue.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "device/device_queue.h" +#include "device/queue.h" -#include "util/util_algorithm.h" -#include "util/util_logging.h" -#include "util/util_time.h" +#include "util/algorithm.h" +#include "util/log.h" +#include "util/time.h" #include <iomanip> diff --git a/intern/cycles/device/device_queue.h b/intern/cycles/device/queue.h index e6835b787cf..188162f4b74 100644 --- a/intern/cycles/device/device_queue.h +++ b/intern/cycles/device/queue.h @@ -16,13 +16,13 @@ #pragma once -#include "device/device_kernel.h" +#include "device/kernel.h" -#include "device/device_graphics_interop.h" -#include "util/util_logging.h" -#include "util/util_map.h" -#include "util/util_string.h" -#include "util/util_unique_ptr.h" +#include "device/graphics_interop.h" +#include "util/log.h" +#include "util/map.h" +#include "util/string.h" +#include "util/unique_ptr.h" CCL_NAMESPACE_BEGIN |