diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-03-12 17:22:18 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-03-12 19:28:55 +0300 |
| commit | 26bea849cfa1d020150e0862002d7d5463f07817 (patch) | |
| tree | 23bfbc7770dc0352dcc5378a14ffc681f7eb22ee /intern/cycles/device/opencl/device_opencl.h | |
| parent | 75be60a66755f96e6d1d9b7e98bd0836784769f6 (diff) | |
Cleanup: add device_texture for images, distinct from other global memory
There was too much image texture specific stuff in device_memory, and too
much code duplication between devices.
Diffstat (limited to 'intern/cycles/device/opencl/device_opencl.h')
| -rw-r--r-- | intern/cycles/device/opencl/device_opencl.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/device/opencl/device_opencl.h b/intern/cycles/device/opencl/device_opencl.h index b761726b1ad..53017c34b2b 100644 --- a/intern/cycles/device/opencl/device_opencl.h +++ b/intern/cycles/device/opencl/device_opencl.h @@ -428,8 +428,10 @@ class OpenCLDevice : public Device { int mem_sub_ptr_alignment(); void const_copy_to(const char *name, void *host, size_t size); - void tex_alloc(device_memory &mem); - void tex_free(device_memory &mem); + void global_alloc(device_memory &mem); + void global_free(device_memory &mem); + void tex_alloc(device_texture &mem); + void tex_free(device_texture &mem); size_t global_size_round_up(int group_size, int global_size); void enqueue_kernel(cl_kernel kernel, |