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

1 files changed, 2 insertions, 3 deletions

diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index e4fb8001b78..64798d75638 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -32,7 +32,7 @@ class Progress;
 
 class ImageManager {
 public:
-	ImageManager();
+	ImageManager(const DeviceInfo& info);
 	~ImageManager();
 
 	int add_image(const string& filename,
@@ -62,7 +62,6 @@ public:
 
 	void set_osl_texture_system(void *texture_system);
 	void set_pack_images(bool pack_images_);
-	void set_extended_image_limits(const DeviceInfo& info);
 	bool set_animation_frame_update(int frame);
 
 	bool need_update;
@@ -86,7 +85,7 @@ public:
 	};
 
 private:
-	int tex_num_images;
+	int tex_num_byte_images;
 	int tex_num_float_images;
 	int tex_image_byte_start;
 	thread_mutex device_mutex;