[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59424] trunk/blender/intern/cycles: Cycles: more code refactoring to rename things internally as well.
Brecht Van Lommel
brechtvanlommel at pandora.be
Fri Aug 23 16:34:34 CEST 2013
Revision: 59424
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59424
Author: blendix
Date: 2013-08-23 14:34:34 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
Cycles: more code refactoring to rename things internally as well. Also change
property name back so we keep compatibility.
Modified Paths:
--------------
trunk/blender/intern/cycles/app/cycles_xml.cpp
trunk/blender/intern/cycles/blender/addon/properties.py
trunk/blender/intern/cycles/blender/addon/ui.py
trunk/blender/intern/cycles/blender/blender_sync.cpp
trunk/blender/intern/cycles/device/device_cuda.cpp
trunk/blender/intern/cycles/device/device_task.h
trunk/blender/intern/cycles/kernel/kernel.cpp
trunk/blender/intern/cycles/kernel/kernel.cu
trunk/blender/intern/cycles/kernel/kernel_emission.h
trunk/blender/intern/cycles/kernel/kernel_path.h
trunk/blender/intern/cycles/kernel/kernel_shader.h
trunk/blender/intern/cycles/kernel/kernel_sse2.cpp
trunk/blender/intern/cycles/kernel/kernel_sse3.cpp
trunk/blender/intern/cycles/kernel/kernel_types.h
trunk/blender/intern/cycles/render/integrator.cpp
trunk/blender/intern/cycles/render/integrator.h
trunk/blender/intern/cycles/render/session.cpp
Modified: trunk/blender/intern/cycles/app/cycles_xml.cpp
===================================================================
--- trunk/blender/intern/cycles/app/cycles_xml.cpp 2013-08-23 14:08:40 UTC (rev 59423)
+++ trunk/blender/intern/cycles/app/cycles_xml.cpp 2013-08-23 14:34:34 UTC (rev 59424)
@@ -252,10 +252,14 @@
static void xml_read_integrator(const XMLReadState& state, pugi::xml_node node)
{
Integrator *integrator = state.scene->integrator;
+ bool branched = false;
- xml_read_bool(&integrator->progressive, node, "progressive");
+ xml_read_bool(&branched, node, "branched");
+
+ if(branched)
+ integrator->method == Integrator::BRANCHED_PATH;
- if(!integrator->progressive) {
+ if(integrator->method == Integrator::BRANCHED_PATH) {
xml_read_int(&integrator->diffuse_samples, node, "diffuse_samples");
xml_read_int(&integrator->glossy_samples, node, "glossy_samples");
xml_read_int(&integrator->transmission_samples, node, "transmission_samples");
Modified: trunk/blender/intern/cycles/blender/addon/properties.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/properties.py 2013-08-23 14:08:40 UTC (rev 59423)
+++ trunk/blender/intern/cycles/blender/addon/properties.py 2013-08-23 14:34:34 UTC (rev 59424)
@@ -128,7 +128,7 @@
description="Use Open Shading Language (CPU rendering only)",
)
- cls.integrator = EnumProperty(
+ cls.progressive = EnumProperty(
name="Integrator",
description="Method to sample lights and materials",
items=enum_integrator,
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2013-08-23 14:08:40 UTC (rev 59423)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2013-08-23 14:34:34 UTC (rev 59424)
@@ -49,7 +49,7 @@
def draw_samples_info(layout, cscene):
- integrator = cscene.integrator
+ integrator = cscene.progressive
# Calculate sample values
if integrator == 'PATH':
@@ -108,7 +108,7 @@
row.operator("render.cycles_sampling_preset_add", text="", icon="ZOOMOUT").remove_active = True
row = layout.row()
- row.prop(cscene, "integrator", text="")
+ row.prop(cscene, "progressive", text="")
row.prop(cscene, "use_square_samples")
split = layout.split()
@@ -119,7 +119,7 @@
sub.prop(cscene, "seed")
sub.prop(cscene, "sample_clamp")
- if cscene.integrator == 'PATH':
+ if cscene.progressive == 'PATH':
col = split.column()
sub = col.column(align=True)
sub.label(text="Samples:")
@@ -715,7 +715,7 @@
sub.prop(lamp, "size", text="Size X")
sub.prop(lamp, "size_y", text="Size Y")
- if cscene.integrator == 'BRANCHED_PATH':
+ if cscene.progressive == 'BRANCHED_PATH':
col.prop(clamp, "samples")
col = split.column()
Modified: trunk/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.cpp 2013-08-23 14:08:40 UTC (rev 59423)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp 2013-08-23 14:34:34 UTC (rev 59424)
@@ -189,7 +189,7 @@
}
#endif
- integrator->progressive = get_int(cscene, "integrator") == 1;
+ integrator->method = (Integrator::Method)get_int(cscene, "progressive");
int diffuse_samples = get_int(cscene, "diffuse_samples");
int glossy_samples = get_int(cscene, "glossy_samples");
@@ -420,7 +420,7 @@
preview_samples = preview_samples * preview_samples;
}
- if(get_int(cscene, "integrator") == 0) {
+ if(get_int(cscene, "progressive") == 0) {
if(background) {
params.samples = aa_samples;
}
Modified: trunk/blender/intern/cycles/device/device_cuda.cpp
===================================================================
--- trunk/blender/intern/cycles/device/device_cuda.cpp 2013-08-23 14:08:40 UTC (rev 59423)
+++ trunk/blender/intern/cycles/device/device_cuda.cpp 2013-08-23 14:34:34 UTC (rev 59424)
@@ -556,7 +556,7 @@
}
}
- void path_trace(RenderTile& rtile, int sample, bool progressive)
+ void path_trace(RenderTile& rtile, int sample, bool branched)
{
if(have_error())
return;
@@ -568,14 +568,14 @@
CUdeviceptr d_rng_state = cuda_device_ptr(rtile.rng_state);
/* get kernel function */
- if(progressive)
- cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace_progressive"))
- else {
- cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace_non_progressive"))
- if(have_error())
- return;
- }
-
+ if(branched)
+ cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_branched_path_trace"))
+ else
+ cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace"))
+
+ if(have_error())
+ return;
+
/* pass in parameters */
int offset = 0;
@@ -918,7 +918,7 @@
if(task->type == DeviceTask::PATH_TRACE) {
RenderTile tile;
- bool progressive = task->integrator_progressive;
+ bool branched = task->integrator_branched;
/* keep rendering tiles until done */
while(task->acquire_tile(this, tile)) {
@@ -931,7 +931,7 @@
break;
}
- path_trace(tile, sample, progressive);
+ path_trace(tile, sample, branched);
tile.sample = sample + 1;
Modified: trunk/blender/intern/cycles/device/device_task.h
===================================================================
--- trunk/blender/intern/cycles/device/device_task.h 2013-08-23 14:08:40 UTC (rev 59423)
+++ trunk/blender/intern/cycles/device/device_task.h 2013-08-23 14:34:34 UTC (rev 59424)
@@ -63,7 +63,7 @@
boost::function<bool(void)> get_cancel;
bool need_finish_queue;
- bool integrator_progressive;
+ bool integrator_branched;
protected:
double last_update_time;
};
Modified: trunk/blender/intern/cycles/kernel/kernel.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel.cpp 2013-08-23 14:08:40 UTC (rev 59423)
+++ trunk/blender/intern/cycles/kernel/kernel.cpp 2013-08-23 14:34:34 UTC (rev 59424)
@@ -88,12 +88,12 @@
void kernel_cpu_path_trace(KernelGlobals *kg, float *buffer, unsigned int *rng_state, int sample, int x, int y, int offset, int stride)
{
-#ifdef __NON_PROGRESSIVE__
- if(!kernel_data.integrator.progressive)
- kernel_path_trace_non_progressive(kg, buffer, rng_state, sample, x, y, offset, stride);
+#ifdef __BRANCHED_PATH__
+ if(kernel_data.integrator.branched)
+ kernel_branched_path_trace(kg, buffer, rng_state, sample, x, y, offset, stride);
else
#endif
- kernel_path_trace_progressive(kg, buffer, rng_state, sample, x, y, offset, stride);
+ kernel_path_trace(kg, buffer, rng_state, sample, x, y, offset, stride);
}
/* Tonemapping */
Modified: trunk/blender/intern/cycles/kernel/kernel.cu
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel.cu 2013-08-23 14:08:40 UTC (rev 59423)
+++ trunk/blender/intern/cycles/kernel/kernel.cu 2013-08-23 14:34:34 UTC (rev 59424)
@@ -24,23 +24,23 @@
#include "kernel_path.h"
#include "kernel_displace.h"
-extern "C" __global__ void kernel_cuda_path_trace_progressive(float *buffer, uint *rng_state, int sample, int sx, int sy, int sw, int sh, int offset, int stride)
+extern "C" __global__ void kernel_cuda_path_trace(float *buffer, uint *rng_state, int sample, int sx, int sy, int sw, int sh, int offset, int stride)
{
int x = sx + blockDim.x*blockIdx.x + threadIdx.x;
int y = sy + blockDim.y*blockIdx.y + threadIdx.y;
if(x < sx + sw && y < sy + sh)
- kernel_path_trace_progressive(NULL, buffer, rng_state, sample, x, y, offset, stride);
+ kernel_path_trace(NULL, buffer, rng_state, sample, x, y, offset, stride);
}
-#ifdef __NON_PROGRESSIVE__
-extern "C" __global__ void kernel_cuda_path_trace_non_progressive(float *buffer, uint *rng_state, int sample, int sx, int sy, int sw, int sh, int offset, int stride)
+#ifdef __BRANCHED_PATH__
+extern "C" __global__ void kernel_cuda_branched_path_trace(float *buffer, uint *rng_state, int sample, int sx, int sy, int sw, int sh, int offset, int stride)
{
int x = sx + blockDim.x*blockIdx.x + threadIdx.x;
int y = sy + blockDim.y*blockIdx.y + threadIdx.y;
if(x < sx + sw && y < sy + sh)
- kernel_path_trace_non_progressive(NULL, buffer, rng_state, sample, x, y, offset, stride);
+ kernel_branched_path_trace(NULL, buffer, rng_state, sample, x, y, offset, stride);
}
#endif
Modified: trunk/blender/intern/cycles/kernel/kernel_emission.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_emission.h 2013-08-23 14:08:40 UTC (rev 59423)
+++ trunk/blender/intern/cycles/kernel/kernel_emission.h 2013-08-23 14:34:34 UTC (rev 59424)
@@ -76,7 +76,7 @@
{
LightSample ls;
-#ifdef __NON_PROGRESSIVE__
+#ifdef __BRANCHED_PATH__
if(lindex != -1) {
/* sample position on a specified light */
light_select(kg, lindex, randu, randv, sd->P, &ls);
Modified: trunk/blender/intern/cycles/kernel/kernel_path.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_path.h 2013-08-23 14:08:40 UTC (rev 59423)
+++ trunk/blender/intern/cycles/kernel/kernel_path.h 2013-08-23 14:34:34 UTC (rev 59424)
@@ -231,7 +231,7 @@
return result;
}
-__device float4 kernel_path_progressive(KernelGlobals *kg, RNG *rng, int sample, Ray ray, __global float *buffer)
+__device float4 kernel_path_integrator(KernelGlobals *kg, RNG *rng, int sample, Ray ray, __global float *buffer)
{
/* initialize */
PathRadiance L;
@@ -543,7 +543,7 @@
return make_float4(L_sum.x, L_sum.y, L_sum.z, 1.0f - L_transparent);
}
-#ifdef __NON_PROGRESSIVE__
+#ifdef __BRANCHED_PATH__
__device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, int sample, Ray ray, __global float *buffer,
float3 throughput, int num_samples, int num_total_samples,
@@ -778,7 +778,7 @@
}
}
-__device_noinline void kernel_path_non_progressive_lighting(KernelGlobals *kg, RNG *rng, int sample,
+__device_noinline void kernel_branched_path_integrate_lighting(KernelGlobals *kg, RNG *rng, int sample,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list