diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-11 10:17:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-11 10:17:02 +0400 |
| commit | da644a9b5845bf367241eb6730fbf639c8abea4d (patch) | |
| tree | 0095dc0a5a35b70f7b74e13c4193dfd6c35d1922 | |
| parent | c08c931fb6f57bdca7865d48ac09a0775590f3ce (diff) | |
Quiet warnings with __CUDA_ARCH__ use
| -rw-r--r-- | intern/cycles/kernel/kernel_textures.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_image.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h index 94115fd388c..b07075c6c95 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 6c658afb9df..daf7c6652d2 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; |