Merge branch 'main' into guard-mslprogram-updateAttributeList

Author: jstone-lucasfilm

source/MaterialXRenderMsl/MetalTextureHandler.h

@@ -89,7 +89,7 @@ class MX_RENDERMSL_API MetalTextureHandler : public ImageHandler
     std::vector<unsigned int> _boundTextureLocations;
 
     std::unordered_map<unsigned int, id<MTLTexture>> _metalTextureMap;
-    std::unordered_map<unsigned int, std::pair<ImagePtr, ImageSamplingProperties>> _imageBindingInfo;
+    std::unordered_map<unsigned int, ImageSamplingProperties> _imageBindingInfo;
     std::unordered_map<ImageSamplingProperties, id<MTLSamplerState>, ImageSamplingKeyHasher> _imageSamplerStateMap;
 
     id<MTLDevice> _device = nil;

source/MaterialXRenderMsl/MetalTextureHandler.mm

@@ -29,7 +29,7 @@
             return false;
         }
     }
-    _imageBindingInfo[image->getResourceId()] = std::make_pair(image, samplingProperties);
+    _imageBindingInfo[image->getResourceId()] = samplingProperties;
     return true;
 }
 
@@ -72,7 +72,7 @@
     _boundTextureLocations[textureUnit] = image->getResourceId();
 
     [renderCmdEncoder setFragmentTexture:_metalTextureMap[image->getResourceId()] atIndex:textureUnit];
-    [renderCmdEncoder setFragmentSamplerState:getSamplerState(_imageBindingInfo[image->getResourceId()].second) atIndex:textureUnit];
+    [renderCmdEncoder setFragmentSamplerState:getSamplerState(_imageBindingInfo[image->getResourceId()]) atIndex:textureUnit];
 
     return true;
 }
@@ -90,15 +90,10 @@
 
 id<MTLTexture> MetalTextureHandler::getMTLTextureForImage(unsigned int index) const
 {
-    auto imageInfo = _imageBindingInfo.find(index);
-    if (imageInfo != _imageBindingInfo.end())
+    auto metalTexture = _metalTextureMap.find(index);
+    if (metalTexture != _metalTextureMap.end())
     {
-        if (!imageInfo->second.first)
-            return nil;
-
-        auto metalTexture = _metalTextureMap.find(imageInfo->second.first->getResourceId());
-        if (metalTexture != _metalTextureMap.end())
-            return metalTexture->second;
+        return metalTexture->second;
     }
 
     return nil;
@@ -109,7 +104,7 @@
     auto imageInfo = _imageBindingInfo.find(index);
     if (imageInfo != _imageBindingInfo.end())
     {
-        return getSamplerState(imageInfo->second.second);
+        return getSamplerState(imageInfo->second);
     }
     return nil;
 }
@@ -202,54 +197,54 @@
     std::vector<unsigned char> rearrangedDataC;
     void* imageData = image->getResourceBuffer();
 
-    if ((pixelFormat == MTLPixelFormatRGBA32Float || pixelFormat == MTLPixelFormatRGBA8Unorm) && channelCount == 3)
+    id<MTLBuffer> buffer = nil;
+    if (imageData)
     {
-        bool isFloat = pixelFormat == MTLPixelFormatRGBA32Float;
+        if ((pixelFormat == MTLPixelFormatRGBA32Float || pixelFormat == MTLPixelFormatRGBA8Unorm) && channelCount == 3)
+        {
+            bool isFloat = pixelFormat == MTLPixelFormatRGBA32Float;
 
-        sourceBytesPerRow = sourceBytesPerRow / 3 * 4;
-        sourceBytesPerImage = sourceBytesPerImage / 3 * 4;
+            sourceBytesPerRow = sourceBytesPerRow / 3 * 4;
+            sourceBytesPerImage = sourceBytesPerImage / 3 * 4;
 
-        size_t srcIdx = 0;
+            size_t srcIdx = 0;
 
-        if (isFloat)
-        {
-            rearrangedDataF.resize(sourceBytesPerImage / sizeof(float));
-            for (size_t dstIdx = 0; dstIdx < rearrangedDataF.size(); ++dstIdx)
+            if (isFloat)
             {
-                if ((dstIdx & 0x3) == 3)
+                rearrangedDataF.resize(sourceBytesPerImage / sizeof(float));
+                for (size_t dstIdx = 0; dstIdx < rearrangedDataF.size(); ++dstIdx)
                 {
-                    rearrangedDataF[dstIdx] = 1.0f;
-                    continue;
+                    if ((dstIdx & 0x3) == 3)
+                    {
+                        rearrangedDataF[dstIdx] = 1.0f;
+                        continue;
+                    }
+
+                    rearrangedDataF[dstIdx] = ((float*) imageData)[srcIdx++];
                 }
 
-                rearrangedDataF[dstIdx] = ((float*) imageData)[srcIdx++];
+                imageData = rearrangedDataF.data();
             }
-
-            imageData = rearrangedDataF.data();
-        }
-        else
-        {
-            rearrangedDataC.resize(sourceBytesPerImage);
-            for (size_t dstIdx = 0; dstIdx < rearrangedDataC.size(); ++dstIdx)
+            else
             {
-                if ((dstIdx & 0x3) == 3)
+                rearrangedDataC.resize(sourceBytesPerImage);
+                for (size_t dstIdx = 0; dstIdx < rearrangedDataC.size(); ++dstIdx)
                 {
-                    rearrangedDataC[dstIdx] = 255;
-                    continue;
+                    if ((dstIdx & 0x3) == 3)
+                    {
+                        rearrangedDataC[dstIdx] = 255;
+                        continue;
+                    }
+
+                    rearrangedDataC[dstIdx] = ((unsigned char*) imageData)[srcIdx++];
                 }
 
-                rearrangedDataC[dstIdx] = ((unsigned char*) imageData)[srcIdx++];
+                imageData = rearrangedDataC.data();
             }
 
-            imageData = rearrangedDataC.data();
+            channelCount = 4;
         }
 
-        channelCount = 4;
-    }
-
-    id<MTLBuffer> buffer = nil;
-    if (imageData)
-    {
         buffer = [_device newBufferWithBytes:imageData
                                       length:sourceBytesPerImage
                                      options:MTLStorageModeShared];
@@ -281,7 +276,16 @@
 void MetalTextureHandler::releaseRenderResources(ImagePtr image)
 {
     if (!image)
+    {
+        for (auto iter : _imageCache)
+        {
+            if (iter.second)
+            {
+                releaseRenderResources(iter.second);
+            }
+        }
         return;
+    }
 
     if (image->getResourceId() == MslProgram::UNDEFINED_METAL_RESOURCE_ID)
     {