Merge branch 'main' into release-all-imagesin-releaseRenderResources

Author: jstone-lucasfilm

source/MaterialXRenderMsl/MetalTextureHandler.mm

@@ -197,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];