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.

1 files changed, 138 insertions, 0 deletions

diff --git a/intern/cycles/util/types.h b/intern/cycles/util/types.h
new file mode 100644
index 00000000000..697dc2b44ea
--- /dev/null
+++ b/intern/cycles/util/types.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2011-2013 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_H__
+#define __UTIL_TYPES_H__
+
+#include <stdlib.h>
+
+/* Standard Integer Types */
+
+#if !defined(__KERNEL_GPU__)
+#  include <stdint.h>
+#endif
+
+#include "util/defines.h"
+
+#ifndef __KERNEL_GPU__
+#  include "util/optimization.h"
+#  include "util/simd.h"
+#endif
+
+CCL_NAMESPACE_BEGIN
+
+/* Types
+ *
+ * Define simpler unsigned type names, and integer with defined number of bits.
+ * Also vector types, named to be compatible with OpenCL builtin types, while
+ * working for CUDA and C++ too. */
+
+/* Shorter Unsigned Names */
+
+typedef unsigned char uchar;
+typedef unsigned int uint;
+typedef unsigned short ushort;
+
+/* Fixed Bits Types */
+
+#ifndef __KERNEL_GPU__
+/* Generic Memory Pointer */
+
+typedef uint64_t device_ptr;
+#endif /* __KERNEL_GPU__ */
+
+ccl_device_inline size_t align_up(size_t offset, size_t alignment)
+{
+  return (offset + alignment - 1) & ~(alignment - 1);
+}
+
+ccl_device_inline size_t divide_up(size_t x, size_t y)
+{
+  return (x + y - 1) / y;
+}
+
+ccl_device_inline size_t round_up(size_t x, size_t multiple)
+{
+  return ((x + multiple - 1) / multiple) * multiple;
+}
+
+ccl_device_inline size_t round_down(size_t x, size_t multiple)
+{
+  return (x / multiple) * multiple;
+}
+
+ccl_device_inline bool is_power_of_two(size_t x)
+{
+  return (x & (x - 1)) == 0;
+}
+
+CCL_NAMESPACE_END
+
+/* Vectorized types declaration. */
+#include "util/types_uchar2.h"
+#include "util/types_uchar3.h"
+#include "util/types_uchar4.h"
+
+#include "util/types_int2.h"
+#include "util/types_int3.h"
+#include "util/types_int4.h"
+
+#include "util/types_uint2.h"
+#include "util/types_uint3.h"
+#include "util/types_uint4.h"
+
+#include "util/types_ushort4.h"
+
+#include "util/types_float2.h"
+#include "util/types_float3.h"
+#include "util/types_float4.h"
+#include "util/types_float8.h"
+
+#include "util/types_vector3.h"
+
+/* Vectorized types implementation. */
+#include "util/types_uchar2_impl.h"
+#include "util/types_uchar3_impl.h"
+#include "util/types_uchar4_impl.h"
+
+#include "util/types_int2_impl.h"
+#include "util/types_int3_impl.h"
+#include "util/types_int4_impl.h"
+
+#include "util/types_uint2_impl.h"
+#include "util/types_uint3_impl.h"
+#include "util/types_uint4_impl.h"
+
+#include "util/types_float2_impl.h"
+#include "util/types_float3_impl.h"
+#include "util/types_float4_impl.h"
+#include "util/types_float8_impl.h"
+
+#include "util/types_vector3_impl.h"
+
+/* SSE types. */
+#ifndef __KERNEL_GPU__
+#  include "util/sseb.h"
+#  include "util/ssef.h"
+#  include "util/ssei.h"
+#  if defined(__KERNEL_AVX__) || defined(__KERNEL_AVX2__)
+#    include "util/avxb.h"
+#    include "util/avxf.h"
+#    include "util/avxi.h"
+#  endif
+#endif
+
+#endif /* __UTIL_TYPES_H__ */