[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49396] branches/soc-2011-tomato/intern/ cycles: Tomato Cycles: resolve textures limit when using CPU render
Sergey Sharybin
sergey.vfx at gmail.com
Mon Jul 30 17:26:07 CEST 2012
Revision: 49396
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49396
Author: nazgul
Date: 2012-07-30 15:26:06 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Tomato Cycles: resolve textures limit when using CPU render
Remove limit for number of textures when using CPU rendering,
so huge scenes from Mango could be rendered properly.
Re-arranged float and bytes textures for this, so now float
textures goes before byte. This is needed to make alignment
stuff easier for variable number of textures.
Also replace code-generated CPU kernel structure's members
with an array, which makes it easier to access textures
without adding bunch of cases in switch.
Should be no functional changes when rendering with GPU
or OpenCL devices.
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_cpu.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_globals.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_textures.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_image.h
branches/soc-2011-tomato/intern/cycles/render/image.cpp
branches/soc-2011-tomato/intern/cycles/render/image.h
branches/soc-2011-tomato/intern/cycles/render/scene.cpp
branches/soc-2011-tomato/intern/cycles/render/scene.h
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp 2012-07-30 15:09:48 UTC (rev 49395)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp 2012-07-30 15:26:06 UTC (rev 49396)
@@ -86,7 +86,7 @@
last_progress = -1.0f;
/* create scene */
- scene = new Scene(scene_params);
+ scene = new Scene(scene_params, session_params.device);
/* create sync */
sync = new BlenderSync(b_engine, b_data, b_scene, scene, !background);
Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel.cpp 2012-07-30 15:09:48 UTC (rev 49395)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel.cpp 2012-07-30 15:26:06 UTC (rev 49396)
@@ -87,14 +87,10 @@
else if(strstr(name, "__tex_image_float")) {
texture_image_float4 *tex = NULL;
int id = atoi(name + strlen("__tex_image_float_"));
+ int array_index = id;
- switch(id) {
- case 95: tex = &kg->__tex_image_float_095; break;
- case 96: tex = &kg->__tex_image_float_096; break;
- case 97: tex = &kg->__tex_image_float_097; break;
- case 98: tex = &kg->__tex_image_float_098; break;
- case 99: tex = &kg->__tex_image_float_099; break;
- default: break;
+ if (array_index >= 0 && array_index < MAX_FLOAT_IMAGES) {
+ tex = &kg->texture_float_images[array_index];
}
if(tex) {
@@ -106,104 +102,10 @@
else if(strstr(name, "__tex_image")) {
texture_image_uchar4 *tex = NULL;
int id = atoi(name + strlen("__tex_image_"));
+ int array_index = id - MAX_FLOAT_IMAGES;
- switch(id) {
- case 0: tex = &kg->__tex_image_000; break;
- case 1: tex = &kg->__tex_image_001; break;
- case 2: tex = &kg->__tex_image_002; break;
- case 3: tex = &kg->__tex_image_003; break;
- case 4: tex = &kg->__tex_image_004; break;
- case 5: tex = &kg->__tex_image_005; break;
- case 6: tex = &kg->__tex_image_006; break;
- case 7: tex = &kg->__tex_image_007; break;
- case 8: tex = &kg->__tex_image_008; break;
- case 9: tex = &kg->__tex_image_009; break;
- case 10: tex = &kg->__tex_image_010; break;
- case 11: tex = &kg->__tex_image_011; break;
- case 12: tex = &kg->__tex_image_012; break;
- case 13: tex = &kg->__tex_image_013; break;
- case 14: tex = &kg->__tex_image_014; break;
- case 15: tex = &kg->__tex_image_015; break;
- case 16: tex = &kg->__tex_image_016; break;
- case 17: tex = &kg->__tex_image_017; break;
- case 18: tex = &kg->__tex_image_018; break;
- case 19: tex = &kg->__tex_image_019; break;
- case 20: tex = &kg->__tex_image_020; break;
- case 21: tex = &kg->__tex_image_021; break;
- case 22: tex = &kg->__tex_image_022; break;
- case 23: tex = &kg->__tex_image_023; break;
- case 24: tex = &kg->__tex_image_024; break;
- case 25: tex = &kg->__tex_image_025; break;
- case 26: tex = &kg->__tex_image_026; break;
- case 27: tex = &kg->__tex_image_027; break;
- case 28: tex = &kg->__tex_image_028; break;
- case 29: tex = &kg->__tex_image_029; break;
- case 30: tex = &kg->__tex_image_030; break;
- case 31: tex = &kg->__tex_image_031; break;
- case 32: tex = &kg->__tex_image_032; break;
- case 33: tex = &kg->__tex_image_033; break;
- case 34: tex = &kg->__tex_image_034; break;
- case 35: tex = &kg->__tex_image_035; break;
- case 36: tex = &kg->__tex_image_036; break;
- case 37: tex = &kg->__tex_image_037; break;
- case 38: tex = &kg->__tex_image_038; break;
- case 39: tex = &kg->__tex_image_039; break;
- case 40: tex = &kg->__tex_image_040; break;
- case 41: tex = &kg->__tex_image_041; break;
- case 42: tex = &kg->__tex_image_042; break;
- case 43: tex = &kg->__tex_image_043; break;
- case 44: tex = &kg->__tex_image_044; break;
- case 45: tex = &kg->__tex_image_045; break;
- case 46: tex = &kg->__tex_image_046; break;
- case 47: tex = &kg->__tex_image_047; break;
- case 48: tex = &kg->__tex_image_048; break;
- case 49: tex = &kg->__tex_image_049; break;
- case 50: tex = &kg->__tex_image_050; break;
- case 51: tex = &kg->__tex_image_051; break;
- case 52: tex = &kg->__tex_image_052; break;
- case 53: tex = &kg->__tex_image_053; break;
- case 54: tex = &kg->__tex_image_054; break;
- case 55: tex = &kg->__tex_image_055; break;
- case 56: tex = &kg->__tex_image_056; break;
- case 57: tex = &kg->__tex_image_057; break;
- case 58: tex = &kg->__tex_image_058; break;
- case 59: tex = &kg->__tex_image_059; break;
- case 60: tex = &kg->__tex_image_060; break;
- case 61: tex = &kg->__tex_image_061; break;
- case 62: tex = &kg->__tex_image_062; break;
- case 63: tex = &kg->__tex_image_063; break;
- case 64: tex = &kg->__tex_image_064; break;
- case 65: tex = &kg->__tex_image_065; break;
- case 66: tex = &kg->__tex_image_066; break;
- case 67: tex = &kg->__tex_image_067; break;
- case 68: tex = &kg->__tex_image_068; break;
- case 69: tex = &kg->__tex_image_069; break;
- case 70: tex = &kg->__tex_image_070; break;
- case 71: tex = &kg->__tex_image_071; break;
- case 72: tex = &kg->__tex_image_072; break;
- case 73: tex = &kg->__tex_image_073; break;
- case 74: tex = &kg->__tex_image_074; break;
- case 75: tex = &kg->__tex_image_075; break;
- case 76: tex = &kg->__tex_image_076; break;
- case 77: tex = &kg->__tex_image_077; break;
- case 78: tex = &kg->__tex_image_078; break;
- case 79: tex = &kg->__tex_image_079; break;
- case 80: tex = &kg->__tex_image_080; break;
- case 81: tex = &kg->__tex_image_081; break;
- case 82: tex = &kg->__tex_image_082; break;
- case 83: tex = &kg->__tex_image_083; break;
- case 84: tex = &kg->__tex_image_084; break;
- case 85: tex = &kg->__tex_image_085; break;
- case 86: tex = &kg->__tex_image_086; break;
- case 87: tex = &kg->__tex_image_087; break;
- case 88: tex = &kg->__tex_image_088; break;
- case 89: tex = &kg->__tex_image_089; break;
- case 90: tex = &kg->__tex_image_090; break;
- case 91: tex = &kg->__tex_image_091; break;
- case 92: tex = &kg->__tex_image_092; break;
- case 93: tex = &kg->__tex_image_093; break;
- case 94: tex = &kg->__tex_image_094; break;
- default: break;
+ if (array_index >= 0 && array_index < MAX_BYTE_IMAGES) {
+ tex = &kg->texture_byte_images[array_index];
}
if(tex) {
Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_cpu.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_cpu.h 2012-07-30 15:09:48 UTC (rev 49395)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_cpu.h 2012-07-30 15:26:06 UTC (rev 49396)
@@ -158,7 +158,7 @@
#define kernel_tex_fetch_m128(tex, index) (kg->tex.fetch_m128(index))
#define kernel_tex_fetch_m128i(tex, index) (kg->tex.fetch_m128i(index))
#define kernel_tex_interp(tex, t, size) (kg->tex.interp(t, size))
-#define kernel_tex_image_interp(tex, x, y) (kg->tex.interp(x, y))
+#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_data (kg->__data)
Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel_globals.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel_globals.h 2012-07-30 15:09:48 UTC (rev 49395)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel_globals.h 2012-07-30 15:26:06 UTC (rev 49396)
@@ -35,10 +35,15 @@
#ifdef __KERNEL_CPU__
+#define MAX_BYTE_IMAGES 512
+#define MAX_FLOAT_IMAGES 5
+
typedef struct KernelGlobals {
+ texture_image_uchar4 texture_byte_images[MAX_BYTE_IMAGES];
+ texture_image_float4 texture_float_images[MAX_FLOAT_IMAGES];
#define KERNEL_TEX(type, ttype, name) ttype name;
-#define KERNEL_IMAGE_TEX(type, ttype, name) ttype name;
+#define KERNEL_IMAGE_TEX(type, ttype, name)
#include "kernel_textures.h"
KernelData __data;
Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel_textures.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel_textures.h 2012-07-30 15:09:48 UTC (rev 49395)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel_textures.h 2012-07-30 15:26:06 UTC (rev 49396)
@@ -66,12 +66,14 @@
/* sobol */
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)
+
/* image */
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_000)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_001)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_002)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_003)
-KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_004)
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)
@@ -162,14 +164,12 @@
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_092)
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_093)
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_094)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_095)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_096)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_097)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_098)
+KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_099)
-/* full-float image */
-KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_095)
-KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_096)
-KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_097)
-KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_098)
-KERNEL_IMAGE_TEX(float4, texture_image_float4, __tex_image_float_099)
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list