From 6ec599c68214413475cbea403ef869ed7c8113f9 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 3 Nov 2017 20:21:19 +0100 Subject: Fix T53247: mixed CPU + GPU render wrong texture limits. --- intern/cycles/device/device.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'intern/cycles/device/device.h') diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 316bf70a5c3..4f78b9e82a4 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -52,13 +52,14 @@ public: string description; string id; /* used for user preferences, should stay fixed with changing hardware config */ int num; - bool display_device; - bool advanced_shading; - bool has_bindless_textures; /* flag for GPU and Multi device */ - bool has_volume_decoupled; - bool has_qbvh; - bool has_osl; - bool use_split_kernel; /* Denotes if the device is going to run cycles using split-kernel */ + bool display_device; /* GPU is used as a display device. */ + bool advanced_shading; /* Supports full shading system. */ + bool has_fermi_limits; /* Fixed number of textures limit. */ + bool has_half_images; /* Support half-float textures. */ + bool has_volume_decoupled; /* Decoupled volume shading. */ + bool has_qbvh; /* Supports both BVH2 and BVH4 raytracing. */ + bool has_osl; /* Support Open Shading Language. */ + bool use_split_kernel; /* Use split or mega kernel. */ int cpu_threads; vector multi_devices; @@ -70,7 +71,8 @@ public: cpu_threads = 0; display_device = false; advanced_shading = true; - has_bindless_textures = false; + has_fermi_limits = false; + has_half_images = false; has_volume_decoupled = false; has_qbvh = false; has_osl = false; -- cgit v1.2.3