Merge branch 'master' into soc-2020-io-performancesoc-2020-io-performance

1 files changed, 0 insertions, 50 deletions

diff --git a/intern/cycles/util/util_types_uchar3_impl.h b/intern/cycles/util/util_types_uchar3_impl.h
deleted file mode 100644
index aa31b725731..00000000000
--- a/intern/cycles/util/util_types_uchar3_impl.h
+++ /dev/null
@@ -1,50 +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_UCHAR3_IMPL_H__
-#define __UTIL_TYPES_UCHAR3_IMPL_H__
-
-#ifndef __UTIL_TYPES_H__
-#  error "Do not include this file directly, include util_types.h instead."
-#endif
-
-CCL_NAMESPACE_BEGIN
-
-#ifndef __KERNEL_GPU__
-uchar uchar3::operator[](int i) const
-{
-  util_assert(i >= 0);
-  util_assert(i < 3);
-  return *(&x + i);
-}
-
-uchar &uchar3::operator[](int i)
-{
-  util_assert(i >= 0);
-  util_assert(i < 3);
-  return *(&x + i);
-}
-
-ccl_device_inline uchar3 make_uchar3(uchar x, uchar y, uchar z)
-{
-  uchar3 a = {x, y, z};
-  return a;
-}
-#endif /* __KERNEL_GPU__ */
-
-CCL_NAMESPACE_END
-
-#endif /* __UTIL_TYPES_UCHAR3_IMPL_H__ */