small fixes

Author: Przemog1

include/nbl/video/ILogicalDevice.h

@@ -85,7 +85,7 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
         bool supportsMask(const uint32_t queueFamilyIndex, core::bitflag<asset::ACCESS_FLAGS> accessMask) const;
 
         //! NOTE/TODO: this is not yet finished
-        inline bool validateMemoryBarrier(const uint32_t queueFamilyIndex, asset::SMemoryBarrier barrier) const;
+        bool validateMemoryBarrier(const uint32_t queueFamilyIndex, asset::SMemoryBarrier barrier) const;
         inline bool validateMemoryBarrier(const uint32_t queueFamilyIndex, const IGPUCommandBuffer::SOwnershipTransferBarrier& barrier, const bool concurrentSharing) const
         {
             // implicitly satisfied by our API:

include/nbl/video/IPhysicalDevice.h

@@ -559,11 +559,11 @@ class NBL_API2 IPhysicalDevice : public core::Interface, public core::Unmovable
                     if (videoDecodeDPB && !other.videoDecodeDPB) return false;
                     if (videoEncodeInput && !other.videoEncodeInput) return false;
                     if (videoEncodeDPB && !other.videoEncodeDPB) return false;
-                    if (other.storageImageLoadWithoutFormat && !storageImageLoadWithoutFormat) return false;
-                    if (other.storageImageStoreWithoutFormat && !storageImageStoreWithoutFormat) return false;
-                    if (other.depthCompareSampledImage && !depthCompareSampledImage) return false;
-                    if (other.hostImageTransfer && !hostImageTransfer) return false;
-                    if (other.log2MaxSamples < log2MaxSamples) return false;
+                    if (storageImageLoadWithoutFormat && !other.storageImageLoadWithoutFormat) return false;
+                    if (storageImageStoreWithoutFormat && !other.storageImageStoreWithoutFormat) return false;
+                    if (depthCompareSampledImage && !other.depthCompareSampledImage) return false;
+                    if (hostImageTransfer && !other.hostImageTransfer) return false;
+                    if (log2MaxSamples > other.log2MaxSamples) return false;
                     return true;
                 }
 

src/nbl/CMakeLists.txt

@@ -83,15 +83,13 @@ include(common)
 
 #[[ Loaders and writers compile options available to edit by user
 	All revelant _NBL_COMPILE_WITH will be there]]
-option(_NBL_COMPILE_WITH_MTL_LOADER_ "Compile with MTL Loader" ON)
-option(_NBL_COMPILE_WITH_OBJ_LOADER_ "Compile with OBJ Loader" ON)
+option(_NBL_COMPILE_WITH_MTL_LOADER_ "Compile with MTL Loader" OFF) #default off until Material Compiler 2
+option(_NBL_COMPILE_WITH_OBJ_LOADER_ "Compile with OBJ Loader" OFF) #default off until Material Compiler 2
 #option(_NBL_COMPILE_WITH_OBJ_WRITER_ "Compile with OBJ Writer" ON) uncomment when writer exists
-option(_NBL_COMPILE_WITH_STL_LOADER_ "Compile with STL Loader" ON)
+option(_NBL_COMPILE_WITH_STL_LOADER_ "Compile with STL Loader" OFF) #default off until Material Compiler 2
 option(_NBL_COMPILE_WITH_STL_WRITER_ "Compile with STL Writer" ON)
-option(_NBL_COMPILE_WITH_PLY_LOADER_ "Compile with PLY Loader" ON)
+option(_NBL_COMPILE_WITH_PLY_LOADER_ "Compile with PLY Loader" OFF) #default off until Material Compiler 2
 option(_NBL_COMPILE_WITH_PLY_WRITER_ "Compile with PLY Writer" ON)
-option(_NBL_COMPILE_WITH_BAW_LOADER_ "Compile with BAW Loader" OFF)
-option(_NBL_COMPILE_WITH_BAW_WRITER_ "Compile with BAW Writer" OFF)
 option(_NBL_COMPILE_WITH_JPG_LOADER_ "Compile with JPG Loader" ON)
 option(_NBL_COMPILE_WITH_JPG_WRITER_ "Compile with JPG Writer" ON)
 option(_NBL_COMPILE_WITH_PNG_LOADER_ "Compile with PNG Loader" ON)