[Bf-blender-cvs] [cde10e7] master: Fix array bounds compile warning.

Thomas Dinges noreply at git.blender.org
Thu May 12 14:21:22 CEST 2016


Commit: cde10e774c39bc4359259558abed6263ed15c392
Author: Thomas Dinges
Date:   Thu May 12 14:20:12 2016 +0200
Branches: master
https://developer.blender.org/rBcde10e774c39bc4359259558abed6263ed15c392

Fix array bounds compile warning.

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

M	intern/cycles/util/util_texture.h

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

diff --git a/intern/cycles/util/util_texture.h b/intern/cycles/util/util_texture.h
index e5a36dd..1f0046c 100644
--- a/intern/cycles/util/util_texture.h
+++ b/intern/cycles/util/util_texture.h
@@ -26,28 +26,28 @@ CCL_NAMESPACE_BEGIN
 #define TEX_NUM_FLOAT4_IMAGES_CPU	1024
 #define TEX_NUM_FLOAT_IMAGES_CPU	1024
 #define TEX_IMAGE_BYTE4_START_CPU	TEX_NUM_FLOAT4_IMAGES_CPU
-#define TEX_IMAGE_FLOAT_START_CPU	TEX_NUM_FLOAT4_IMAGES_CPU + TEX_NUM_BYTE4_IMAGES_CPU
+#define TEX_IMAGE_FLOAT_START_CPU	(TEX_NUM_FLOAT4_IMAGES_CPU + TEX_NUM_BYTE4_IMAGES_CPU)
 
 /* CUDA (Fermi) */
 #define TEX_NUM_BYTE4_IMAGES_CUDA	88
 #define TEX_NUM_FLOAT4_IMAGES_CUDA	5
 #define TEX_NUM_FLOAT_IMAGES_CUDA	0
 #define TEX_IMAGE_BYTE4_START_CUDA	TEX_NUM_FLOAT4_IMAGES_CUDA
-#define TEX_IMAGE_FLOAT_START_CUDA	TEX_NUM_FLOAT4_IMAGES_CUDA + TEX_NUM_BYTE4_IMAGES_CUDA
+#define TEX_IMAGE_FLOAT_START_CUDA	(TEX_NUM_FLOAT4_IMAGES_CUDA + TEX_NUM_BYTE4_IMAGES_CUDA)
 
 /* CUDA (KEPLER and above) */
 #define TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER	145
 #define TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER	5
 #define TEX_NUM_FLOAT_IMAGES_CUDA_KEPLER	0
 #define TEX_IMAGE_BYTE4_START_CUDA_KEPLER	TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER
-#define TEX_IMAGE_FLOAT_START_CUDA_KEPLER	TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER + TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER
+#define TEX_IMAGE_FLOAT_START_CUDA_KEPLER	(TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER + TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER)
 
 /* OpenCL */
 #define TEX_NUM_BYTE4_IMAGES_OPENCL		1024
 #define TEX_NUM_FLOAT4_IMAGES_OPENCL	1024
 #define TEX_NUM_FLOAT_IMAGES_OPENCL		0
 #define TEX_IMAGE_BYTE4_START_OPENCL	TEX_NUM_FLOAT4_IMAGES_OPENCL
-#define TEX_IMAGE_FLOAT_START_OPENCL	TEX_NUM_FLOAT4_IMAGES_OPENCL + TEX_NUM_BYTE4_IMAGES_OPENCL
+#define TEX_IMAGE_FLOAT_START_OPENCL	(TEX_NUM_FLOAT4_IMAGES_OPENCL + TEX_NUM_BYTE4_IMAGES_OPENCL)
 
 
 /* Color to use when textures are not found. */




More information about the Bf-blender-cvs mailing list