Cleanup: Shorten texture variables, tex and image was kinda redundant.

Also make prefix consistent, so it starts with either TEX_NUM or TEX_START, followed by texture type and architecture.

7 files changed, 96 insertions, 96 deletions

diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h
index 7e6cdf93fb9..e06c68f2fc9 100644
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@ -35,10 +35,10 @@ struct Intersection;
 struct VolumeStep;
 
 typedef struct KernelGlobals {
-	texture_image_uchar4 texture_byte4_images[TEX_NUM_BYTE4_IMAGES_CPU];
-	texture_image_float4 texture_float4_images[TEX_NUM_FLOAT4_IMAGES_CPU];
-	texture_image_float texture_float_images[TEX_NUM_FLOAT_IMAGES_CPU];
-	texture_image_uchar texture_byte_images[TEX_NUM_BYTE_IMAGES_CPU];
+	texture_image_uchar4 texture_byte4_images[TEX_NUM_BYTE4_CPU];
+	texture_image_float4 texture_float4_images[TEX_NUM_FLOAT4_CPU];
+	texture_image_float texture_float_images[TEX_NUM_FLOAT_CPU];
+	texture_image_uchar texture_byte_images[TEX_NUM_BYTE_CPU];
 
 #  define KERNEL_TEX(type, ttype, name) ttype name;
 #  define KERNEL_IMAGE_TEX(type, ttype, name)
diff --git a/intern/cycles/kernel/kernels/cpu/kernel.cpp b/intern/cycles/kernel/kernels/cpu/kernel.cpp
index 365ce891354..d8a83f69685 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel.cpp
+++ b/intern/cycles/kernel/kernels/cpu/kernel.cpp
@@ -95,7 +95,7 @@ void kernel_tex_copy(KernelGlobals *kg,
 		int id = atoi(name + strlen("__tex_image_float4_"));
 		int array_index = id;
 
-		if(array_index >= 0 && array_index < TEX_NUM_FLOAT4_IMAGES_CPU) {
+		if(array_index >= 0 && array_index < TEX_NUM_FLOAT4_CPU) {
 			tex = &kg->texture_float4_images[array_index];
 		}
 
@@ -109,9 +109,9 @@ void kernel_tex_copy(KernelGlobals *kg,
 	else if(strstr(name, "__tex_image_float")) {
 		texture_image_float *tex = NULL;
 		int id = atoi(name + strlen("__tex_image_float_"));
-		int array_index = id - TEX_IMAGE_FLOAT_START_CPU;
+		int array_index = id - TEX_START_FLOAT_CPU;
 
-		if(array_index >= 0 && array_index < TEX_NUM_FLOAT_IMAGES_CPU) {
+		if(array_index >= 0 && array_index < TEX_NUM_FLOAT_CPU) {
 			tex = &kg->texture_float_images[array_index];
 		}
 
@@ -125,9 +125,9 @@ void kernel_tex_copy(KernelGlobals *kg,
 	else if(strstr(name, "__tex_image_byte4")) {
 		texture_image_uchar4 *tex = NULL;
 		int id = atoi(name + strlen("__tex_image_byte4_"));
-		int array_index = id - TEX_IMAGE_BYTE4_START_CPU;
+		int array_index = id - TEX_START_BYTE4_CPU;
 
-		if(array_index >= 0 && array_index < TEX_NUM_BYTE4_IMAGES_CPU) {
+		if(array_index >= 0 && array_index < TEX_NUM_BYTE4_CPU) {
 			tex = &kg->texture_byte4_images[array_index];
 		}
 
@@ -141,9 +141,9 @@ void kernel_tex_copy(KernelGlobals *kg,
 	else if(strstr(name, "__tex_image_byte")) {
 		texture_image_uchar *tex = NULL;
 		int id = atoi(name + strlen("__tex_image_byte_"));
-		int array_index = id - TEX_IMAGE_BYTE_START_CPU;
+		int array_index = id - TEX_START_BYTE_CPU;
 
-		if(array_index >= 0 && array_index < TEX_NUM_BYTE_IMAGES_CPU) {
+		if(array_index >= 0 && array_index < TEX_NUM_BYTE_CPU) {
 			tex = &kg->texture_byte_images[array_index];
 		}
 
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h b/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
index 4807f96a0df..b10861ab857 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
+++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
@@ -23,24 +23,24 @@ CCL_NAMESPACE_BEGIN
 
 ccl_device float4 kernel_tex_image_interp_impl(KernelGlobals *kg, int tex, float x, float y)
 {
-	if(tex >= TEX_IMAGE_BYTE_START_CPU)
-		return kg->texture_byte_images[tex - TEX_IMAGE_BYTE_START_CPU].interp(x, y);
-	else if(tex >= TEX_IMAGE_FLOAT_START_CPU)
-		return kg->texture_float_images[tex - TEX_IMAGE_FLOAT_START_CPU].interp(x, y);
-	else if(tex >= TEX_IMAGE_BYTE4_START_CPU)
-		return kg->texture_byte4_images[tex - TEX_IMAGE_BYTE4_START_CPU].interp(x, y);
+	if(tex >= TEX_START_BYTE_CPU)
+		return kg->texture_byte_images[tex - TEX_START_BYTE_CPU].interp(x, y);
+	else if(tex >= TEX_START_FLOAT_CPU)
+		return kg->texture_float_images[tex - TEX_START_FLOAT_CPU].interp(x, y);
+	else if(tex >= TEX_START_BYTE4_CPU)
+		return kg->texture_byte4_images[tex - TEX_START_BYTE4_CPU].interp(x, y);
 	else
 		return kg->texture_float4_images[tex].interp(x, y);
 }
 
 ccl_device float4 kernel_tex_image_interp_3d_impl(KernelGlobals *kg, int tex, float x, float y, float z)
 {
-	if(tex >= TEX_IMAGE_BYTE_START_CPU)
-		return kg->texture_byte_images[tex - TEX_IMAGE_BYTE_START_CPU].interp_3d(x, y, z);
-	else if(tex >= TEX_IMAGE_FLOAT_START_CPU)
-		return kg->texture_float_images[tex - TEX_IMAGE_FLOAT_START_CPU].interp_3d(x, y, z);
-	else if(tex >= TEX_IMAGE_BYTE4_START_CPU)
-		return kg->texture_byte4_images[tex - TEX_IMAGE_BYTE4_START_CPU].interp_3d(x, y, z);
+	if(tex >= TEX_START_BYTE_CPU)
+		return kg->texture_byte_images[tex - TEX_START_BYTE_CPU].interp_3d(x, y, z);
+	else if(tex >= TEX_START_FLOAT_CPU)
+		return kg->texture_float_images[tex - TEX_START_FLOAT_CPU].interp_3d(x, y, z);
+	else if(tex >= TEX_START_BYTE4_CPU)
+		return kg->texture_byte4_images[tex - TEX_START_BYTE4_CPU].interp_3d(x, y, z);
 	else
 		return kg->texture_float4_images[tex].interp_3d(x, y, z);
 
@@ -48,12 +48,12 @@ ccl_device float4 kernel_tex_image_interp_3d_impl(KernelGlobals *kg, int tex, fl
 
 ccl_device float4 kernel_tex_image_interp_3d_ex_impl(KernelGlobals *kg, int tex, float x, float y, float z, int interpolation)
 {
-	if(tex >= TEX_IMAGE_BYTE_START_CPU)
-		return kg->texture_byte_images[tex - TEX_IMAGE_BYTE_START_CPU].interp_3d_ex(x, y, z, interpolation);
-	else if(tex >= TEX_IMAGE_FLOAT_START_CPU)
-		return kg->texture_float_images[tex - TEX_IMAGE_FLOAT_START_CPU].interp_3d_ex(x, y, z, interpolation);
-	else if(tex >= TEX_IMAGE_BYTE4_START_CPU)
-		return kg->texture_byte4_images[tex - TEX_IMAGE_BYTE4_START_CPU].interp_3d_ex(x, y, z, interpolation);
+	if(tex >= TEX_START_BYTE_CPU)
+		return kg->texture_byte_images[tex - TEX_START_BYTE_CPU].interp_3d_ex(x, y, z, interpolation);
+	else if(tex >= TEX_START_FLOAT_CPU)
+		return kg->texture_float_images[tex - TEX_START_FLOAT_CPU].interp_3d_ex(x, y, z, interpolation);
+	else if(tex >= TEX_START_BYTE4_CPU)
+		return kg->texture_byte4_images[tex - TEX_START_BYTE4_CPU].interp_3d_ex(x, y, z, interpolation);
 	else
 		return kg->texture_float4_images[tex].interp_3d_ex(x, y, z, interpolation);
 }
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h
index 92d2b36bbb1..3d9ab405849 100644
--- a/intern/cycles/kernel/svm/svm_image.h
+++ b/intern/cycles/kernel/svm/svm_image.h
@@ -18,15 +18,15 @@ CCL_NAMESPACE_BEGIN
 
 /* Float4 textures on various devices. */
 #if defined(__KERNEL_CPU__)
-#  define TEX_NUM_FLOAT4_IMAGES	TEX_NUM_FLOAT4_IMAGES_CPU
+#  define TEX_NUM_FLOAT4_IMAGES	TEX_NUM_FLOAT4_CPU
 #elif defined(__KERNEL_CUDA__)
 #  if __CUDA_ARCH__ < 300
-#    define TEX_NUM_FLOAT4_IMAGES	TEX_NUM_FLOAT4_IMAGES_CUDA
+#    define TEX_NUM_FLOAT4_IMAGES	TEX_NUM_FLOAT4_CUDA
 #  else
-#    define TEX_NUM_FLOAT4_IMAGES	TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER
+#    define TEX_NUM_FLOAT4_IMAGES	TEX_NUM_FLOAT4_CUDA_KEPLER
 #  endif
 #else
-#  define TEX_NUM_FLOAT4_IMAGES	TEX_NUM_FLOAT4_IMAGES_OPENCL
+#  define TEX_NUM_FLOAT4_IMAGES	TEX_NUM_FLOAT4_OPENCL
 #endif
 
 #ifdef __KERNEL_OPENCL__
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index a3d2d23a205..2bef90d2333 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -51,46 +51,46 @@ ImageManager::ImageManager(const DeviceInfo& info)
 
 	/* CPU */
 	if(device_type == DEVICE_CPU) {
-		tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_IMAGES_CPU;
-		tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_IMAGES_CPU;
-		tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_IMAGES_CPU;
-		tex_num_images[IMAGE_DATA_TYPE_BYTE] = TEX_NUM_BYTE_IMAGES_CPU;
-		tex_image_byte4_start = TEX_IMAGE_BYTE4_START_CPU;
-		tex_image_float_start = TEX_IMAGE_FLOAT_START_CPU;
-		tex_image_byte_start = TEX_IMAGE_BYTE_START_CPU;
+		tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_CPU;
+		tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_CPU;
+		tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_CPU;
+		tex_num_images[IMAGE_DATA_TYPE_BYTE] = TEX_NUM_BYTE_CPU;
+		tex_image_byte4_start = TEX_START_BYTE4_CPU;
+		tex_image_float_start = TEX_START_FLOAT_CPU;
+		tex_image_byte_start = TEX_START_BYTE_CPU;
 	}
 	/* CUDA */
 	else if(device_type == DEVICE_CUDA) {
 		if(info.has_bindless_textures) {
 			/* Kepler and above */
-			tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER;
-			tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER;
-			tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_IMAGES_CUDA_KEPLER;
-			tex_num_images[IMAGE_DATA_TYPE_BYTE] = TEX_NUM_BYTE_IMAGES_CUDA_KEPLER;
-			tex_image_byte4_start = TEX_IMAGE_BYTE4_START_CUDA_KEPLER;
-			tex_image_float_start = TEX_IMAGE_FLOAT_START_CUDA_KEPLER;
-			tex_image_byte_start = TEX_IMAGE_BYTE_START_CUDA_KEPLER;
+			tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_CUDA_KEPLER;
+			tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_CUDA_KEPLER;
+			tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_CUDA_KEPLER;
+			tex_num_images[IMAGE_DATA_TYPE_BYTE] = TEX_NUM_BYTE_CUDA_KEPLER;
+			tex_image_byte4_start = TEX_START_BYTE4_CUDA_KEPLER;
+			tex_image_float_start = TEX_START_FLOAT_CUDA_KEPLER;
+			tex_image_byte_start = TEX_START_BYTE_CUDA_KEPLER;
 		}
 		else {
 			/* Fermi */
-			tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_IMAGES_CUDA;
-			tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_IMAGES_CUDA;
-			tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_IMAGES_CUDA;
-			tex_num_images[IMAGE_DATA_TYPE_BYTE] = TEX_NUM_BYTE_IMAGES_CUDA;
-			tex_image_byte4_start = TEX_IMAGE_BYTE4_START_CUDA;
-			tex_image_float_start = TEX_IMAGE_FLOAT_START_CUDA;
-			tex_image_byte_start = TEX_IMAGE_BYTE_START_CUDA;
+			tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_CUDA;
+			tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_CUDA;
+			tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_CUDA;
+			tex_num_images[IMAGE_DATA_TYPE_BYTE] = TEX_NUM_BYTE_CUDA;
+			tex_image_byte4_start = TEX_START_BYTE4_CUDA;
+			tex_image_float_start = TEX_START_FLOAT_CUDA;
+			tex_image_byte_start = TEX_START_BYTE_CUDA;
 		}
 	}
 	/* OpenCL */
 	else if(device_type == DEVICE_OPENCL) {
-		tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_IMAGES_OPENCL;
-		tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_IMAGES_OPENCL;
-		tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_IMAGES_OPENCL;
-		tex_num_images[IMAGE_DATA_TYPE_BYTE] = TEX_NUM_BYTE_IMAGES_OPENCL;
-		tex_image_byte4_start = TEX_IMAGE_BYTE4_START_OPENCL;
-		tex_image_float_start = TEX_IMAGE_FLOAT_START_OPENCL;
-		tex_image_byte_start = TEX_IMAGE_BYTE_START_OPENCL;
+		tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_OPENCL;
+		tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_OPENCL;
+		tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_OPENCL;
+		tex_num_images[IMAGE_DATA_TYPE_BYTE] = TEX_NUM_BYTE_OPENCL;
+		tex_image_byte4_start = TEX_START_BYTE4_OPENCL;
+		tex_image_float_start = TEX_START_FLOAT_OPENCL;
+		tex_image_byte_start = TEX_START_BYTE_OPENCL;
 	}
 	/* Should never happen */
 	else {
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h
index 33c03d40f27..b34d6127118 100644
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@ -109,10 +109,10 @@ public:
 	device_vector<uint> sobol_directions;
 
 	/* cpu images */
-	device_vector<uchar4> tex_byte4_image[TEX_NUM_BYTE4_IMAGES_CPU];
-	device_vector<float4> tex_float4_image[TEX_NUM_FLOAT4_IMAGES_CPU];
-	device_vector<float> tex_float_image[TEX_NUM_FLOAT_IMAGES_CPU];
-	device_vector<uchar> tex_byte_image[TEX_NUM_BYTE_IMAGES_CPU];
+	device_vector<uchar4> tex_byte4_image[TEX_NUM_BYTE4_CPU];
+	device_vector<float4> tex_float4_image[TEX_NUM_FLOAT4_CPU];
+	device_vector<float> tex_float_image[TEX_NUM_FLOAT_CPU];
+	device_vector<uchar> tex_byte_image[TEX_NUM_BYTE_CPU];
 
 	/* opencl images */
 	device_vector<uchar4> tex_image_byte4_packed;
diff --git a/intern/cycles/util/util_texture.h b/intern/cycles/util/util_texture.h
index 6da47858133..c419c3aab61 100644
--- a/intern/cycles/util/util_texture.h
+++ b/intern/cycles/util/util_texture.h
@@ -19,43 +19,43 @@
 
 CCL_NAMESPACE_BEGIN
 
-/* Texture limits on various devices. */
+/* Texture limits on devices. */
 
 /* CPU */
-#define TEX_NUM_BYTE4_IMAGES_CPU	1024
-#define TEX_NUM_FLOAT4_IMAGES_CPU	1024
-#define TEX_NUM_FLOAT_IMAGES_CPU	1024
-#define TEX_NUM_BYTE_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_BYTE_START_CPU	(TEX_NUM_FLOAT4_IMAGES_CPU + TEX_NUM_BYTE4_IMAGES_CPU + TEX_NUM_BYTE_IMAGES_CPU)
+#define TEX_NUM_FLOAT4_CPU		1024
+#define TEX_NUM_BYTE4_CPU		1024
+#define TEX_NUM_FLOAT_CPU		1024
+#define TEX_NUM_BYTE_CPU		1024
+#define TEX_START_BYTE4_CPU		TEX_NUM_FLOAT4_CPU
+#define TEX_START_FLOAT_CPU		(TEX_NUM_FLOAT4_CPU + TEX_NUM_BYTE4_CPU)
+#define TEX_START_BYTE_CPU		(TEX_NUM_FLOAT4_CPU + TEX_NUM_BYTE4_CPU + TEX_NUM_BYTE_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_NUM_BYTE_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_BYTE_START_CUDA	(TEX_NUM_FLOAT4_IMAGES_CUDA + TEX_NUM_BYTE4_IMAGES_CUDA + TEX_NUM_BYTE_IMAGES_CUDA)
+/* CUDA (Geforce 4xx and 5xx) */
+#define TEX_NUM_FLOAT4_CUDA		5
+#define TEX_NUM_BYTE4_CUDA		88
+#define TEX_NUM_FLOAT_CUDA		0
+#define TEX_NUM_BYTE_CUDA		0
+#define TEX_START_BYTE4_CUDA	TEX_NUM_FLOAT4_CUDA
+#define TEX_START_FLOAT_CUDA	(TEX_NUM_FLOAT4_CUDA + TEX_NUM_BYTE4_CUDA)
+#define TEX_START_BYTE_CUDA		(TEX_NUM_FLOAT4_CUDA + TEX_NUM_BYTE4_CUDA + TEX_NUM_BYTE_CUDA)
 
-/* CUDA (KEPLER and above) */
-#define TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER	1024
-#define TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER	1024
-#define TEX_NUM_FLOAT_IMAGES_CUDA_KEPLER	1024
-#define TEX_NUM_BYTE_IMAGES_CUDA_KEPLER		1024
-#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_BYTE_START_CUDA_KEPLER	(TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER + TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER + TEX_NUM_BYTE_IMAGES_CUDA_KEPLER)
+/* CUDA (Kepler, Geforce 6xx and above) */
+#define TEX_NUM_FLOAT4_CUDA_KEPLER		1024
+#define TEX_NUM_BYTE4_CUDA_KEPLER		1024
+#define TEX_NUM_FLOAT_CUDA_KEPLER		1024
+#define TEX_NUM_BYTE_CUDA_KEPLER		1024
+#define TEX_START_BYTE4_CUDA_KEPLER		TEX_NUM_FLOAT4_CUDA_KEPLER
+#define TEX_START_FLOAT_CUDA_KEPLER		(TEX_NUM_FLOAT4_CUDA_KEPLER + TEX_NUM_BYTE4_CUDA_KEPLER)
+#define TEX_START_BYTE_CUDA_KEPLER		(TEX_NUM_FLOAT4_CUDA_KEPLER + TEX_NUM_BYTE4_CUDA_KEPLER + TEX_NUM_BYTE_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_NUM_BYTE_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_BYTE_START_OPENCL		(TEX_NUM_FLOAT4_IMAGES_OPENCL + TEX_NUM_BYTE4_IMAGES_OPENCL + TEX_NUM_BYTE_IMAGES_OPENCL)
+#define TEX_NUM_FLOAT4_OPENCL	1024
+#define TEX_NUM_BYTE4_OPENCL	1024
+#define TEX_NUM_FLOAT_OPENCL	0
+#define TEX_NUM_BYTE_OPENCL		0
+#define TEX_START_BYTE4_OPENCL	TEX_NUM_FLOAT4_OPENCL
+#define TEX_START_FLOAT_OPENCL	(TEX_NUM_FLOAT4_OPENCL + TEX_NUM_BYTE4_OPENCL)
+#define TEX_START_BYTE_OPENCL	(TEX_NUM_FLOAT4_OPENCL + TEX_NUM_BYTE4_OPENCL + TEX_NUM_BYTE_OPENCL)
 
 
 /* Color to use when textures are not found. */