[Bf-blender-cvs] [3807bcb] master: Cleanup: Rename texture slots to float4 and byte, to distinguish from future float (single channel) and half_float slots.

Thomas Dinges noreply at git.blender.org
Fri May 6 14:40:23 CEST 2016


Commit: 3807bcb3a845475ac938a331329d3fd92d90c3e4
Author: Thomas Dinges
Date:   Fri May 6 13:42:50 2016 +0200
Branches: master
https://developer.blender.org/rB3807bcb3a845475ac938a331329d3fd92d90c3e4

Cleanup: Rename texture slots to float4 and byte, to distinguish from future float (single channel) and half_float slots.

Should be no functional changes, tested CPU and CUDA.

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

M	intern/cycles/device/device_cuda.cpp
M	intern/cycles/kernel/geom/geom_volume.h
M	intern/cycles/kernel/kernel_compat_cpu.h
M	intern/cycles/kernel/kernel_globals.h
M	intern/cycles/kernel/kernel_textures.h
M	intern/cycles/kernel/kernels/cpu/kernel.cpp
M	intern/cycles/kernel/svm/svm_image.h
M	intern/cycles/render/image.cpp
M	intern/cycles/render/image.h
M	intern/cycles/render/scene.h
M	intern/cycles/util/util_texture.h

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

diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index f1a17d6..f7c985e 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -483,7 +483,7 @@ public:
 			 */
 			vector<string> tokens;
 			string_split(tokens, name, "_");
-			bind_name = string_printf("__tex_image_%s3d_%s",
+			bind_name = string_printf("__tex_image_%s_3d_%s",
 			                          tokens[2].c_str(),
 			                          tokens[3].c_str());
 		}
diff --git a/intern/cycles/kernel/geom/geom_volume.h b/intern/cycles/kernel/geom/geom_volume.h
index 14b6738..7bd3933 100644
--- a/intern/cycles/kernel/geom/geom_volume.h
+++ b/intern/cycles/kernel/geom/geom_volume.h
@@ -34,11 +34,11 @@ ccl_device float4 volume_image_texture_3d(int id, float x, float y, float z)
 {
 	float4 r;
 	switch(id) {
-		case 0: r = kernel_tex_image_interp_3d(__tex_image_float3d_000, x, y, z); break;
-		case 1: r = kernel_tex_image_interp_3d(__tex_image_float3d_001, x, y, z); break;
-		case 2: r = kernel_tex_image_interp_3d(__tex_image_float3d_002, x, y, z); break;
-		case 3: r = kernel_tex_image_interp_3d(__tex_image_float3d_003, x, y, z); break;
-		case 4: r = kernel_tex_image_interp_3d(__tex_image_float3d_004, x, y, z); break;
+		case 0: r = kernel_tex_image_interp_3d(__tex_image_float4_3d_000, x, y, z); break;
+		case 1: r = kernel_tex_image_interp_3d(__tex_image_float4_3d_001, x, y, z); break;
+		case 2: r = kernel_tex_image_interp_3d(__tex_image_float4_3d_002, x, y, z); break;
+		case 3: r = kernel_tex_image_interp_3d(__tex_image_float4_3d_003, x, y, z); break;
+		case 4: r = kernel_tex_image_interp_3d(__tex_image_float4_3d_004, x, y, z); break;
 	}
 	return r;
 }
diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h
index b96a844..6e56f1e 100644
--- a/intern/cycles/kernel/kernel_compat_cpu.h
+++ b/intern/cycles/kernel/kernel_compat_cpu.h
@@ -479,9 +479,9 @@ typedef texture_image<uchar4> texture_image_uchar4;
 #define kernel_tex_fetch_ssef(tex, index) (kg->tex.fetch_ssef(index))
 #define kernel_tex_fetch_ssei(tex, index) (kg->tex.fetch_ssei(index))
 #define kernel_tex_lookup(tex, t, offset, size) (kg->tex.lookup(t, offset, size))
-#define kernel_tex_image_interp(tex, x, y) ((tex < MAX_FLOAT_IMAGES) ? kg->texture_float_images[tex].interp(x, y) : kg->texture_byte_images[tex - MAX_FLOAT_IMAGES].interp(x, y))
-#define kernel_tex_image_interp_3d(tex, x, y, z) ((tex < MAX_FLOAT_IMAGES) ? kg->texture_float_images[tex].interp_3d(x, y, z) : kg->texture_byte_images[tex - MAX_FLOAT_IMAGES].interp_3d(x, y, z))
-#define kernel_tex_image_interp_3d_ex(tex, x, y, z, interpolation) ((tex < MAX_FLOAT_IMAGES) ? kg->texture_float_images[tex].interp_3d_ex(x, y, z, interpolation) : kg->texture_byte_images[tex - MAX_FLOAT_IMAGES].interp_3d_ex(x, y, z, interpolation))
+#define kernel_tex_image_interp(tex, x, y) ((tex < MAX_FLOAT4_IMAGES) ? kg->texture_float4_images[tex].interp(x, y) : kg->texture_byte_images[tex - MAX_FLOAT4_IMAGES].interp(x, y))
+#define kernel_tex_image_interp_3d(tex, x, y, z) ((tex < MAX_FLOAT4_IMAGES) ? kg->texture_float4_images[tex].interp_3d(x, y, z) : kg->texture_byte_images[tex - MAX_FLOAT4_IMAGES].interp_3d(x, y, z))
+#define kernel_tex_image_interp_3d_ex(tex, x, y, z, interpolation) ((tex < MAX_FLOAT4_IMAGES) ? kg->texture_float4_images[tex].interp_3d_ex(x, y, z, interpolation) : kg->texture_byte_images[tex - MAX_FLOAT4_IMAGES].interp_3d_ex(x, y, z, interpolation))
 
 #define kernel_data (kg->__data)
 
diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h
index 52e718f..3291239 100644
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@ -32,11 +32,11 @@ struct OSLShadingSystem;
 #  endif
 
 #  define MAX_BYTE_IMAGES   1024
-#  define MAX_FLOAT_IMAGES  1024
+#  define MAX_FLOAT4_IMAGES  1024
 
 typedef struct KernelGlobals {
 	texture_image_uchar4 texture_byte_images[MAX_BYTE_IMAGES];
-	texture_image_float4 texture_float_images[MAX_FLOAT_IMAGES];
+	texture_image_float4 texture_float4_images[MAX_FLOAT4_IMAGES];
 
 #  define KERNEL_TEX(type, ttype, name) ttype name;
 #  define KERNEL_IMAGE_TEX(type, ttype, name)
diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h
index 2a048b7..12eb884 100644
--- a/intern/cycles/kernel/kernel_textures.h
+++ b/intern/cycles/kernel/kernel_textures.h
@@ -73,167 +73,167 @@ KERNEL_TEX(float, texture_float, __lookup_table)
 KERNEL_TEX(uint, texture_uint, __sobol_directions)
 
 /* full-float image */
-KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_000)
-KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_001)
-KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_002)
-KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_003)
-KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_004)
-
-KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float3d_000)
-KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float3d_001)
-KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float3d_002)
-KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float3d_003)
-KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float3d_004)
+KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float4_000)
+KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float4_001)
+KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float4_002)
+KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float4_003)
+KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float4_004)
+
+KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float4_3d_000)
+KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float4_3d_001)
+KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float4_3d_002)
+KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float4_3d_003)
+KERNEL_IMAGE_TEX(float4, texture_image3d_float4, __tex_image_float4_3d_004)
 
 /* image */
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_005)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_006)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_007)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_008)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_009)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_010)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_011)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_012)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_013)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_014)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_015)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_016)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_017)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_018)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_019)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_020)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_021)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_022)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_023)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_024)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_025)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_026)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_027)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_028)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_029)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_030)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_031)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_032)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_033)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_034)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_035)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_036)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_037)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_038)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_039)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_040)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_041)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_042)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_043)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_044)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_045)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_046)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_047)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_048)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_049)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_050)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_051)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_052)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_053)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_054)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_055)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_056)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_057)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_058)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_059)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_060)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_061)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_062)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_063)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_064)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_065)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_066)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_067)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4,

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list