Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Quiet warnings with __CUDA_ARCH__ use

Browse Source
This commit is contained in:
Campbell Barton
2014-05-11 16:17:02 +10:00
parent c08c931fb6
commit da644a9b58
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/kernel_textures.h
View File

@@ -175,7 +175,7 @@ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_098)
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_099) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_099)
/* Kepler and above */ /* 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_100)
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_101) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_101)
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_102) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_102)

2
intern/cycles/kernel/svm/svm_image.h
View File

@@ -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 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; 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 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 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; case 102: r = kernel_tex_image_interp(__tex_image_102, x, y); break;