diff options
Diffstat (limited to 'intern/cycles/integrator/shader_eval.h')
| -rw-r--r-- | intern/cycles/integrator/shader_eval.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/intern/cycles/integrator/shader_eval.h b/intern/cycles/integrator/shader_eval.h index 7dbf334b8d7..013fad17d4f 100644 --- a/intern/cycles/integrator/shader_eval.h +++ b/intern/cycles/integrator/shader_eval.h @@ -40,19 +40,22 @@ class ShaderEval { /* Evaluate shader at points specified by KernelShaderEvalInput and write out * RGBA colors to output. */ bool eval(const ShaderEvalType type, - const int max_num_points, + const int max_num_inputs, + const int num_channels, const function<int(device_vector<KernelShaderEvalInput> &)> &fill_input, - const function<void(device_vector<float4> &)> &read_output); + const function<void(device_vector<float> &)> &read_output); protected: bool eval_cpu(Device *device, const ShaderEvalType type, device_vector<KernelShaderEvalInput> &input, - device_vector<float4> &output); + device_vector<float> &output, + const int64_t work_size); bool eval_gpu(Device *device, const ShaderEvalType type, device_vector<KernelShaderEvalInput> &input, - device_vector<float4> &output); + device_vector<float> &output, + const int64_t work_size); Device *device_; Progress &progress_; |