[Bf-blender-cvs] [fce03b0] soc-2016-cycles_images: Bindless Textures: Some cleanup.
Thomas Dinges
noreply at git.blender.org
Sat May 14 00:04:44 CEST 2016
Commit: fce03b028d3fa9c61af2d5b0e242a3e4de619a13
Author: Thomas Dinges
Date: Sat May 14 00:03:01 2016 +0200
Branches: soc-2016-cycles_images
https://developer.blender.org/rBfce03b028d3fa9c61af2d5b0e242a3e4de619a13
Bindless Textures: Some cleanup.
1) Rename extended_images to bindless_textures
2) Remove kepler textures slots, they will no longer be needed.
Nothing to see here yet. Just some preparations for further work.
===================================================================
M intern/cycles/device/device.h
M intern/cycles/device/device_cuda.cpp
M intern/cycles/device/device_multi.cpp
M intern/cycles/kernel/kernel_textures.h
M intern/cycles/kernel/svm/svm_image.h
M intern/cycles/render/image.cpp
M intern/cycles/util/util_texture.h
===================================================================
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index 4c1b722..4004dd8 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -54,7 +54,7 @@ public:
bool display_device;
bool advanced_shading;
bool pack_images;
- bool extended_images; /* flag for GPU and Multi device */
+ bool bindless_textures; /* flag for GPU and Multi device */
bool use_split_kernel; /* Denotes if the device is going to run cycles using split-kernel */
vector<DeviceInfo> multi_devices;
@@ -66,7 +66,7 @@ public:
display_device = false;
advanced_shading = true;
pack_images = false;
- extended_images = false;
+ bindless_textures = false;
use_split_kernel = false;
}
};
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 69015e7..7913290 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -1269,7 +1269,7 @@ void device_cuda_info(vector<DeviceInfo>& devices)
info.num = num;
info.advanced_shading = (major >= 2);
- info.extended_images = (major >= 3);
+ info.bindless_textures = (major >= 3);
info.pack_images = false;
/* if device has a kernel timeout, assume it is used for display */
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp
index 6141f9a..e802410 100644
--- a/intern/cycles/device/device_multi.cpp
+++ b/intern/cycles/device/device_multi.cpp
@@ -352,7 +352,7 @@ static bool device_multi_add(vector<DeviceInfo>& devices, DeviceType type, bool
info.advanced_shading = with_advanced_shading;
info.pack_images = false;
- info.extended_images = true;
+ info.bindless_textures = true;
foreach(DeviceInfo& subinfo, devices) {
if(subinfo.type == type) {
@@ -376,7 +376,7 @@ static bool device_multi_add(vector<DeviceInfo>& devices, DeviceType type, bool
if(subinfo.display_device)
info.display_device = true;
info.pack_images = info.pack_images || subinfo.pack_images;
- info.extended_images = info.extended_images && subinfo.extended_images;
+ info.bindless_textures = info.bindless_textures && subinfo.bindless_textures;
num_added++;
}
}
diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h
index 62b0a6f..87c77ef 100644
--- a/intern/cycles/kernel/kernel_textures.h
+++ b/intern/cycles/kernel/kernel_textures.h
@@ -174,66 +174,6 @@ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_089)
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_090)
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_091)
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_092)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_093)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_094)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_095)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_096)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_097)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_098)
-
-/* Kepler and above */
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_099)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_100)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_101)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_102)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_103)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_104)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_105)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_106)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_107)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_108)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_109)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_110)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_111)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_112)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_113)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_114)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_115)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_116)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_117)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_118)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_119)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_120)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_121)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_122)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_123)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_124)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_125)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_126)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_127)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_128)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_129)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_130)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_131)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_132)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_133)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_134)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_135)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_136)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_137)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_138)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_139)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_140)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_141)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_142)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_143)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_144)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_145)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_146)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_147)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_148)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_149)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_150)
/* packed image (opencl) */
KERNEL_TEX(uchar4, texture_uchar4, __tex_image_byte4_packed)
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h
index faff4ce..d2ffa42 100644
--- a/intern/cycles/kernel/svm/svm_image.h
+++ b/intern/cycles/kernel/svm/svm_image.h
@@ -254,68 +254,6 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y,
case 90: r = kernel_tex_image_interp(__tex_image_byte4_090, x, y); break;
case 91: r = kernel_tex_image_interp(__tex_image_byte4_091, x, y); break;
case 92: r = kernel_tex_image_interp(__tex_image_byte4_092, x, y); break;
-
-# if defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 300)
- case 93: r = kernel_tex_image_interp(__tex_image_byte4_093, x, y); break;
- case 94: r = kernel_tex_image_interp(__tex_image_byte4_094, x, y); break;
- case 95: r = kernel_tex_image_interp(__tex_image_byte4_095, x, y); break;
- case 96: r = kernel_tex_image_interp(__tex_image_byte4_096, x, y); break;
- case 97: r = kernel_tex_image_interp(__tex_image_byte4_097, x, y); break;
- case 98: r = kernel_tex_image_interp(__tex_image_byte4_098, x, y); break;
- case 99: r = kernel_tex_image_interp(__tex_image_byte4_099, x, y); break;
- case 100: r = kernel_tex_image_interp(__tex_image_byte4_100, x, y); break;
- case 101: r = kernel_tex_image_interp(__tex_image_byte4_101, x, y); break;
- case 102: r = kernel_tex_image_interp(__tex_image_byte4_102, x, y); break;
- case 103: r = kernel_tex_image_interp(__tex_image_byte4_103, x, y); break;
- case 104: r = kernel_tex_image_interp(__tex_image_byte4_104, x, y); break;
- case 105: r = kernel_tex_image_interp(__tex_image_byte4_105, x, y); break;
- case 106: r = kernel_tex_image_interp(__tex_image_byte4_106, x, y); break;
- case 107: r = kernel_tex_image_interp(__tex_image_byte4_107, x, y); break;
- case 108: r = kernel_tex_image_interp(__tex_image_byte4_108, x, y); break;
- case 109: r = kernel_tex_image_interp(__tex_image_byte4_109, x, y); break;
- case 110: r = kernel_tex_image_interp(__tex_image_byte4_110, x, y); break;
- case 111: r = kernel_tex_image_interp(__tex_image_byte4_111, x, y); break;
- case 112: r = kernel_tex_image_interp(__tex_image_byte4_112, x, y); break;
- case 113: r = kernel_tex_image_interp(__tex_image_byte4_113, x, y); break;
- case 114: r = kernel_tex_image_interp(__tex_image_byte4_114, x, y); break;
- case 115: r = kernel_tex_image_interp(__tex_image_byte4_115, x, y); break;
- case 116: r = kernel_tex_image_interp(__tex_image_byte4_116, x, y); break;
- case 117: r = kernel_tex_image_interp(__tex_image_byte4_117, x, y); break;
- case 118: r = kernel_tex_image_interp(__tex_image_byte4_118, x, y); break;
- case 119: r = kernel_tex_image_interp(__tex_image_byte4_119, x, y); break;
- case 120: r = kernel_tex_image_interp(__tex_image_byte4_120, x, y); break;
- case 121: r = kernel_tex_image_interp(__tex_image_byte4_121, x, y); break;
- case 122: r = kernel_tex_image_interp(__tex_image_byte4_122, x, y); break;
- case 123: r = kernel_tex_image_interp(__tex_image_byte4_123, x, y); break;
- case 124: r = kernel_tex_image_interp(__tex_image_byte4_124, x, y); break;
- case 125: r = kernel_tex_image_interp(__tex_image_byte4_125, x, y); break;
- case 126: r = kernel_tex_image_interp(__tex_image_byte4_126, x, y); break;
- case 127: r = kernel_tex_image_interp(__tex_image_byte
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list