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/render/image.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/render/image.h')
| -rw-r--r-- | intern/cycles/render/image.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 82f3e2759c6..734bb83f774 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -142,7 +142,7 @@ class ImageHandle { ImageMetaData metadata(); int svm_slot(const int tile_index = 0) const; - device_memory *image_memory(const int tile_index = 0) const; + device_texture *image_memory(const int tile_index = 0) const; protected: vector<int> tile_slots; @@ -191,7 +191,7 @@ class ImageManager { bool builtin; string mem_name; - device_memory *mem; + device_texture *mem; int users; thread_mutex mutex; @@ -212,8 +212,8 @@ class ImageManager { void load_image_metadata(Image *img); - template<TypeDesc::BASETYPE FileFormat, typename StorageType, typename DeviceType> - bool file_load_image(Image *img, int texture_limit, device_vector<DeviceType> &tex_img); + template<TypeDesc::BASETYPE FileFormat, typename StorageType> + bool file_load_image(Image *img, int texture_limit); void device_load_image(Device *device, Scene *scene, int slot, Progress *progress); void device_free_image(Device *device, int slot); |