← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to intern/cycles/device/device_cpu.cpp

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/cycles/device/device_cpu.cpp
67
67
                task_pool.stop();
68
68
        }
69
69
 
70
 
        bool support_advanced_shading()
71
 
        {
72
 
                return true;
73
 
        }
74
 
 
75
70
        void mem_alloc(device_memory& mem, MemoryType type)
76
71
        {
77
72
                mem.device_pointer = mem.data_pointer;
251
246
                        for(int y = task.y; y < task.y + task.h; y++)
252
247
                                for(int x = task.x; x < task.x + task.w; x++)
253
248
                                        kernel_cpu_sse3_tonemap(&kernel_globals, (uchar4*)task.rgba, (float*)task.buffer,
254
 
                                                task.sample, task.resolution, x, y, task.offset, task.stride);
 
249
                                                task.sample, x, y, task.offset, task.stride);
255
250
                }
256
251
                else if(system_cpu_support_sse2()) {
257
252
                        for(int y = task.y; y < task.y + task.h; y++)
258
253
                                for(int x = task.x; x < task.x + task.w; x++)
259
254
                                        kernel_cpu_sse2_tonemap(&kernel_globals, (uchar4*)task.rgba, (float*)task.buffer,
260
 
                                                task.sample, task.resolution, x, y, task.offset, task.stride);
 
255
                                                task.sample, x, y, task.offset, task.stride);
261
256
                }
262
257
                else
263
258
#endif
265
260
                        for(int y = task.y; y < task.y + task.h; y++)
266
261
                                for(int x = task.x; x < task.x + task.w; x++)
267
262
                                        kernel_cpu_tonemap(&kernel_globals, (uchar4*)task.rgba, (float*)task.buffer,
268
 
                                                task.sample, task.resolution, x, y, task.offset, task.stride);
 
263
                                                task.sample, x, y, task.offset, task.stride);
269
264
                }
270
265
        }
271
266