diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-03-09 19:19:52 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-03-09 19:19:52 +0300 |
| commit | 40412499433ef6d8619fd1e8ecaa00addb163721 (patch) | |
| tree | 17f9e5f936237cb4714f5ef0361f09dd0435db92 /intern/cycles/kernel | |
| parent | ba4d07cc5c74e42445a59bf1e77587cbf4a83482 (diff) | |
| parent | 0a28bb14222c7753a987256a9c155b670137ee37 (diff) | |
Merge branch 'blender2.7'
Conflicts:
intern/cycles/blender/addon/properties.py
intern/cycles/device/opencl/opencl_split.cpp
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernels/opencl/kernel_split.cl | 41 |
2 files changed, 0 insertions, 42 deletions
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 7332346a787..a35eb102c9c 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -41,7 +41,6 @@ set(SRC_OPENCL_KERNELS kernels/opencl/kernel_displace.cl kernels/opencl/kernel_background.cl kernels/opencl/kernel_state_buffer_size.cl - kernels/opencl/kernel_split.cl kernels/opencl/kernel_split_bundle.cl kernels/opencl/kernel_data_init.cl kernels/opencl/kernel_path_init.cl diff --git a/intern/cycles/kernel/kernels/opencl/kernel_split.cl b/intern/cycles/kernel/kernels/opencl/kernel_split.cl deleted file mode 100644 index 4cbda1bc2e7..00000000000 --- a/intern/cycles/kernel/kernels/opencl/kernel_split.cl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2011-2017 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. - */ - -#include "kernel/kernel_compat_opencl.h" // PRECOMPILED -#include "kernel/split/kernel_split_common.h" // PRECOMPILED - -#include "kernel/kernels/opencl/kernel_state_buffer_size.cl" -#include "kernel/kernels/opencl/kernel_data_init.cl" -#include "kernel/kernels/opencl/kernel_path_init.cl" - -#include "kernel/kernels/opencl/kernel_scene_intersect.cl" -#include "kernel/kernels/opencl/kernel_lamp_emission.cl" -#include "kernel/kernels/opencl/kernel_do_volume.cl" -#include "kernel/kernels/opencl/kernel_indirect_background.cl" -#include "kernel/kernels/opencl/kernel_queue_enqueue.cl" -#include "kernel/kernels/opencl/kernel_shader_setup.cl" -#include "kernel/kernels/opencl/kernel_shader_sort.cl" -#include "kernel/kernels/opencl/kernel_shader_eval.cl" -#include "kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl" -#include "kernel/kernels/opencl/kernel_subsurface_scatter.cl" -#include "kernel/kernels/opencl/kernel_direct_lighting.cl" -#include "kernel/kernels/opencl/kernel_shadow_blocked_ao.cl" -#include "kernel/kernels/opencl/kernel_shadow_blocked_dl.cl" -#include "kernel/kernels/opencl/kernel_enqueue_inactive.cl" -#include "kernel/kernels/opencl/kernel_next_iteration_setup.cl" -#include "kernel/kernels/opencl/kernel_indirect_subsurface.cl" -#include "kernel/kernels/opencl/kernel_buffer_update.cl" - |