Cleanup: Remove outdated comment and add new one about slot IDs.
authorThomas Dinges <blender@dingto.org>
Wed, 11 May 2016 20:25:48 +0000 (22:25 +0200)
committerThomas Dinges <blender@dingto.org>
Wed, 11 May 2016 20:25:48 +0000 (22:25 +0200)
intern/cycles/kernel/geom/geom_volume.h
intern/cycles/render/image.cpp

index 7bd3933a1f80b617c3e929f058e4ea3e8b65084f..ef02c01dec6a12025b82f920e9ab9440362061c0 100644 (file)
@@ -77,7 +77,6 @@ ccl_device float volume_attribute_float(KernelGlobals *kg, const ShaderData *sd,
        if(dx) *dx = 0.0f;
        if(dy) *dy = 0.0f;
 
-       /* todo: support float textures to lower memory usage for single floats */
        return average(float4_to_float3(r));
 }
 
index 102c6107fb74d98c08023a939dcfea0ac5a6dfc1..40c48088c5a0f675e1f0e5e8c8d44b72290ffa42 100644 (file)
@@ -196,6 +196,10 @@ ImageManager::ImageDataType ImageManager::get_image_metadata(const string& filen
                return IMAGE_DATA_TYPE_BYTE4;
 }
 
+/* We use a consecutive slot counting scheme on the devices, in order
+ * float4, byte4, float.
+ * These functions convert the slot ids from ImageManager "images" ones
+ * to device ones and vice versa. */
 int ImageManager::type_index_to_flattened_slot(int slot, ImageDataType type)
 {
        if(type == IMAGE_DATA_TYPE_BYTE4)