diff options
author | Thomas Dinges <blender@dingto.org> | 2021-11-01 12:18:30 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2021-11-01 12:18:30 +0300 |
commit | 5327413b37760db2fd1b4457c4dd2db7eee50a8b (patch) | |
tree | e0e71f5ac6395a6fa5e48789fa2f90eef452a1e7 /intern/cycles/scene | |
parent | 289f013e644ad231b32bbc3144d0458b66a96841 (diff) |
Cleanup: Remove Cycles device checks for half float.
All supported devices support half float now, so we can remove the check.
Differential Revision: https://developer.blender.org/D13021
Diffstat (limited to 'intern/cycles/scene')
-rw-r--r-- | intern/cycles/scene/image.cpp | 3 | ||||
-rw-r--r-- | intern/cycles/scene/image.h | 1 | ||||
-rw-r--r-- | intern/cycles/scene/image_oiio.cpp | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/intern/cycles/scene/image.cpp b/intern/cycles/scene/image.cpp index 80091e01b8c..8bb2d87fd1e 100644 --- a/intern/cycles/scene/image.cpp +++ b/intern/cycles/scene/image.cpp @@ -303,7 +303,6 @@ ImageManager::ImageManager(const DeviceInfo &info) animation_frame = 0; /* Set image limits */ - features.has_half_float = info.has_half_images; features.has_nanovdb = info.has_nanovdb; } @@ -357,8 +356,6 @@ void ImageManager::load_image_metadata(Image *img) metadata.detect_colorspace(); - assert(features.has_half_float || - (metadata.type != IMAGE_DATA_TYPE_HALF4 && metadata.type != IMAGE_DATA_TYPE_HALF)); assert(features.has_nanovdb || (metadata.type != IMAGE_DATA_TYPE_NANOVDB_FLOAT || metadata.type != IMAGE_DATA_TYPE_NANOVDB_FLOAT3)); diff --git a/intern/cycles/scene/image.h b/intern/cycles/scene/image.h index 6447b028ebf..7cf09dd6d8f 100644 --- a/intern/cycles/scene/image.h +++ b/intern/cycles/scene/image.h @@ -100,7 +100,6 @@ class ImageMetaData { /* Information about supported features that Image loaders can use. */ class ImageDeviceFeatures { public: - bool has_half_float; bool has_nanovdb; }; diff --git a/intern/cycles/scene/image_oiio.cpp b/intern/cycles/scene/image_oiio.cpp index feafae035a1..68ab9b7a997 100644 --- a/intern/cycles/scene/image_oiio.cpp +++ b/intern/cycles/scene/image_oiio.cpp @@ -76,7 +76,7 @@ bool OIIOImageLoader::load_metadata(const ImageDeviceFeatures &features, ImageMe } /* check if it's half float */ - if (spec.format == TypeDesc::HALF && features.has_half_float) { + if (spec.format == TypeDesc::HALF) { is_half = true; } |