[Bf-blender-cvs] [ab4f6f01a69] master: Cycles: Fix strict compiler flags

Sergey Sharybin noreply at git.blender.org
Tue Apr 25 14:12:18 CEST 2017


Commit: ab4f6f01a69cd155877fdf618993dddbf408565f
Author: Sergey Sharybin
Date:   Tue Apr 25 14:11:45 2017 +0200
Branches: master
https://developer.blender.org/rBab4f6f01a69cd155877fdf618993dddbf408565f

Cycles: Fix strict compiler flags

===================================================================

M	intern/cycles/util/util_types_uint2_impl.h
M	intern/cycles/util/util_types_uint3_impl.h
M	intern/cycles/util/util_types_uint4_impl.h

===================================================================

diff --git a/intern/cycles/util/util_types_uint2_impl.h b/intern/cycles/util/util_types_uint2_impl.h
index d5af59ec2bf..b50ffa2667f 100644
--- a/intern/cycles/util/util_types_uint2_impl.h
+++ b/intern/cycles/util/util_types_uint2_impl.h
@@ -26,14 +26,12 @@ CCL_NAMESPACE_BEGIN
 #ifndef __KERNEL_GPU__
 __forceinline uint uint2::operator[](uint i) const
 {
-	util_assert(i >= 0);
 	util_assert(i < 2);
 	return *(&x + i);
 }
 
 __forceinline uint& uint2::operator[](uint i)
 {
-	util_assert(i >= 0);
 	util_assert(i < 2);
 	return *(&x + i);
 }
diff --git a/intern/cycles/util/util_types_uint3_impl.h b/intern/cycles/util/util_types_uint3_impl.h
index 22a6a1aa29a..26005d5baff 100644
--- a/intern/cycles/util/util_types_uint3_impl.h
+++ b/intern/cycles/util/util_types_uint3_impl.h
@@ -26,14 +26,12 @@ CCL_NAMESPACE_BEGIN
 #ifndef __KERNEL_GPU__
 __forceinline uint uint3::operator[](uint i) const
 {
-	util_assert(i >= 0);
 	util_assert(i < 3);
 	return *(&x + i);
 }
 
 __forceinline uint& uint3::operator[](uint i)
 {
-	util_assert(i >= 0);
 	util_assert(i < 3);
 	return *(&x + i);
 }
diff --git a/intern/cycles/util/util_types_uint4_impl.h b/intern/cycles/util/util_types_uint4_impl.h
index 2858e09dec7..6d48131a446 100644
--- a/intern/cycles/util/util_types_uint4_impl.h
+++ b/intern/cycles/util/util_types_uint4_impl.h
@@ -26,14 +26,12 @@ CCL_NAMESPACE_BEGIN
 #ifndef __KERNEL_GPU__
 __forceinline uint uint4::operator[](uint i) const
 {
-	util_assert(i >= 0);
 	util_assert(i < 3);
 	return *(&x + i);
 }
 
 __forceinline uint& uint4::operator[](uint i)
 {
-	util_assert(i >= 0);
 	util_assert(i < 3);
 	return *(&x + i);
 }




More information about the Bf-blender-cvs mailing list