diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-10-24 15:19:19 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-26 16:37:04 +0300 |
commit | fd25e883e2807a151f673b87c152a59701a0df80 (patch) | |
tree | 9441933f32ba2672ca71c58842342a9c525e123e /intern/cycles/util/util_types_float2_impl.h | |
parent | d7d40745fa09061a3117bd3669c5a46bbf611eae (diff) |
Cycles: remove prefix from source code file names
Remove prefix of filenames that is the same as the folder name. This used
to help when #includes were using individual files, but now they are always
relative to the cycles root directory and so the prefixes are redundant.
For patches and branches, git merge and rebase should be able to detect the
renames and move over code to the right file.
Diffstat (limited to 'intern/cycles/util/util_types_float2_impl.h')
-rw-r--r-- | intern/cycles/util/util_types_float2_impl.h | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/intern/cycles/util/util_types_float2_impl.h b/intern/cycles/util/util_types_float2_impl.h deleted file mode 100644 index 7810d2a8781..00000000000 --- a/intern/cycles/util/util_types_float2_impl.h +++ /dev/null @@ -1,59 +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. - */ - -#ifndef __UTIL_TYPES_FLOAT2_IMPL_H__ -#define __UTIL_TYPES_FLOAT2_IMPL_H__ - -#ifndef __UTIL_TYPES_H__ -# error "Do not include this file directly, include util_types.h instead." -#endif - -#ifndef __KERNEL_GPU__ -# include <cstdio> -#endif - -CCL_NAMESPACE_BEGIN - -#ifndef __KERNEL_GPU__ -__forceinline float float2::operator[](int i) const -{ - util_assert(i >= 0); - util_assert(i < 2); - return *(&x + i); -} - -__forceinline float &float2::operator[](int i) -{ - util_assert(i >= 0); - util_assert(i < 2); - return *(&x + i); -} - -ccl_device_inline float2 make_float2(float x, float y) -{ - float2 a = {x, y}; - return a; -} - -ccl_device_inline void print_float2(const char *label, const float2 &a) -{ - printf("%s: %.8f %.8f\n", label, (double)a.x, (double)a.y); -} -#endif /* __KERNEL_GPU__ */ - -CCL_NAMESPACE_END - -#endif /* __UTIL_TYPES_FLOAT2_IMPL_H__ */ |