From 557544f2c452303ff4b4d3af96551841e4d79040 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Sat, 16 Apr 2016 20:48:33 +0200 Subject: Cycles: Refactor Image Texture limits. Instead of treating Fermi GPU limits as default, and overriding them for other devices, we now nicely set them for each platform. * Due to setting values for all platforms, we don't have to offset the slot id for OpenCL anymore, as the image manager wont add float images for OpenCL now. * Bugfix: TEX_NUM_FLOAT_IMAGES was always 5, even for CPU, so the code in svm_image.h clamped float textures with alpha on CPU after the 5th slot. Reviewers: #cycles, brecht Reviewed By: #cycles, brecht Subscribers: brecht Differential Revision: https://developer.blender.org/D1925 --- intern/cycles/render/scene.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/cycles/render/scene.h') diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index db70ae3c176..d30a0cb45fe 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -109,8 +109,8 @@ public: device_vector sobol_directions; /* cpu images */ - device_vector tex_image[TEX_EXTENDED_NUM_IMAGES_CPU]; - device_vector tex_float_image[TEX_EXTENDED_NUM_FLOAT_IMAGES]; + device_vector tex_image[TEX_NUM_BYTE_IMAGES_CPU]; + device_vector tex_float_image[TEX_NUM_FLOAT_IMAGES_CPU]; /* opencl images */ device_vector tex_image_packed; -- cgit v1.2.3