[Bf-blender-cvs] [da644a9] master: Quiet warnings with __CUDA_ARCH__ use

[Campbell Barton]

Commit: da644a9b5845bf367241eb6730fbf639c8abea4d
Author: Campbell Barton
Date:   Sun May 11 16:17:02 2014 +1000
https://developer.blender.org/rBda644a9b5845bf367241eb6730fbf639c8abea4d

Quiet warnings with __CUDA_ARCH__ use

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

M	intern/cycles/kernel/kernel_textures.h
M	intern/cycles/kernel/svm/svm_image.h

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

diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h
index 94115fd..b07075c 100644
--- a/intern/cycles/kernel/kernel_textures.h
+++ b/intern/cycles/kernel/kernel_textures.h
@@ -175,7 +175,7 @@ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_098)
 KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_099)
 
 /* Kepler and above */
-#if __CUDA_ARCH__ >= 300
+#if defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 300)
 KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_100)
 KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_101)
 KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_102)
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h
index 6c658af..daf7c66 100644
--- a/intern/cycles/kernel/svm/svm_image.h
+++ b/intern/cycles/kernel/svm/svm_image.h
@@ -254,7 +254,7 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y,
 		case 98: r = kernel_tex_image_interp(__tex_image_098, x, y); break;
 		case 99: r = kernel_tex_image_interp(__tex_image_099, x, y); break;
 
-#if __CUDA_ARCH__ >= 300
+#if defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 300)
 		case 100: r = kernel_tex_image_interp(__tex_image_100, x, y); break;
 		case 101: r = kernel_tex_image_interp(__tex_image_101, x, y); break;
 		case 102: r = kernel_tex_image_interp(__tex_image_102, x, y); break;