Commit: 52e34ffe333e1de83540555b6fcf2ff2b4532bc8
Author: Sergey Sharybin
Date: Tue Jan 19 22:28:16 2016 +0100
Branches: master
https://developer.blender.org/rB52e34ffe333e1de83540555b6fcf2ff2b4532bc8
Cycles: Pass missing shader filter argument to CUDA and OpenCL kernels
===================================================================
M intern/cycles/device/device_cuda.cpp
M intern/cycles/device/device_opencl.cpp
===================================================================
diff --git a/intern/cycles/device/device_cuda.cpp
b/intern/cycles/device/device_cuda.cpp
index b87d177..39af40d 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -787,6 +787,9 @@ public:
args[arg++] = &d_output_luma;
}
args[arg++] = &task.shader_eval_type;
+ if(task.shader_eval_type >= SHADER_EVAL_BAKE) {
+ args[arg++] = &task.shader_filter;
+ }
args[arg++] = &shader_x;
args[arg++] = &shader_w;
args[arg++] = &offset;
diff --git a/intern/cycles/device/device_opencl.cpp
b/intern/cycles/device/device_opencl.cpp
index ce854ca..6e2365d 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -1305,6 +1305,7 @@ public:
cl_mem d_output = CL_MEM_PTR(task.shader_output);
cl_mem d_output_luma = CL_MEM_PTR(task.shader_output_luma);
cl_int d_shader_eval_type = task.shader_eval_type;
+ cl_int d_shader_filter = task.shader_filter;
cl_int d_shader_x = task.shader_x;
cl_int d_shader_w = task.shader_w;
cl_int d_offset = task.offset;
@@ -1330,11 +1331,11 @@ public:
d_input,
d_output);
- if(task.shader_eval_type < SHADER_EVAL_BAKE) {
- start_arg_index += kernel_set_args(kernel,
- start_arg_index,
- d_output_luma);
- }
+ if(task.shader_eval_type < SHADER_EVAL_BAKE) {
+ start_arg_index += kernel_set_args(kernel,
+
start_arg_index,
+
d_output_luma);
+ }
#define KERNEL_TEX(type, ttype, name) \
set_kernel_arg_mem(kernel, &start_arg_index, #name);
@@ -1343,7 +1344,13 @@ public:
start_arg_index += kernel_set_args(kernel,
start_arg_index,
- d_shader_eval_type,
+ d_shader_eval_type);
+ if(task.shader_eval_type >= SHADER_EVAL_BAKE) {
+ start_arg_index += kernel_set_args(kernel,
+
d_shader_filter);
+ }
+ start_arg_index += kernel_set_args(kernel,
+ start_arg_index,
d_shader_x,
d_shader_w,
d_offset,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
