Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-08-08 18:17:04 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-08-08 18:17:04 +0300
commitf2809ae0a671057caa1005e2b9cc91648c33dd1f (patch)
treea55cf5ce76087aef6bf80d2b9d7e5a5f843927f7 /intern/cycles/render/image.h
parent0e57282999dc39b665a8119ef3045c3b98f006b0 (diff)
Cycles: Fix crash changing image after recent OpenCL changes
Steps to reproduce: - Create shader Image texture -> Diffuse BSDF -> Output. Do NOT select image yet! - Start viewport render. - Select image from the ID browser of Image Texture node. Thing is: with the memory manager we always need to inform device that memory was freed.
Diffstat (limited to 'intern/cycles/render/image.h')
-rw-r--r--intern/cycles/render/image.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index c86d1cbedbf..abd1abbd729 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -160,6 +160,11 @@ private:
DeviceScene *dscene,
ImageDataType type,
int slot);
+
+ /* Will do locking when needed and make sure possible memory manager from
+ * the device implementation is aware of freed texture.
+ */
+ void device_tex_free_safe(Device *device, device_memory& mem);
};
CCL_NAMESPACE_END