Fixed bugs identified by Xcode static code analysis.

sources/Renderer/DebugLayer/DbgRenderSystem.cpp

@@ -869,8 +869,8 @@ static std::string BindingSlotToString(const BindingSlot& slot)
 
 void DbgRenderSystem::ValidateBufferView(DbgBuffer& bufferDbg, const BufferViewDescriptor& viewDesc, const BindingDescriptor& bindingDesc)
 {
-    const auto minAlignment = GetMinAlignmentForBufferBinding(bindingDesc, limits_);
-    if (viewDesc.offset % minAlignment != 0 || viewDesc.size % minAlignment != 0)
+    const std::uint64_t minAlignment = GetMinAlignmentForBufferBinding(bindingDesc, limits_);
+    if (minAlignment > 0 && (viewDesc.offset % minAlignment != 0 || viewDesc.size % minAlignment != 0))
     {
         LLGL_DBG_ERROR(
             ErrorType::InvalidArgument,

sources/Renderer/Metal/Command/MTCommandExecutor.mm

@@ -117,7 +117,8 @@
 
             /* Source and target texture formats must match for 'copyFromTexture', so create texture view on mismatch */
             id<MTLTexture> sourceTexture;
-            if ([drawableTexture pixelFormat] != [cmd->destinationTexture pixelFormat])
+            const bool isTextureViewRequired = ([drawableTexture pixelFormat] != [cmd->destinationTexture pixelFormat]);
+            if (isTextureViewRequired)
                 sourceTexture = [drawableTexture newTextureViewWithPixelFormat:[cmd->destinationTexture pixelFormat]];
             else
                 sourceTexture = drawableTexture;
@@ -136,7 +137,7 @@
             ];
 
             /* Decrement reference counter for temporary texture */
-            if (sourceTexture != drawableTexture)
+            if (isTextureViewRequired)
                 [sourceTexture release];
             return sizeof(*cmd);
         }

sources/Renderer/Metal/Command/MTDirectCommandBuffer.mm

@@ -353,7 +353,8 @@
 
     /* Source and target texture formats must match for 'copyFromTexture', so create texture view on mismatch */
     id<MTLTexture> sourceTexture;
-    if ([drawableTexture pixelFormat] != [targetTexture pixelFormat])
+    const bool isTextureViewRequired = ([drawableTexture pixelFormat] != [targetTexture pixelFormat]);
+    if (isTextureViewRequired)
         sourceTexture = [drawableTexture newTextureViewWithPixelFormat:[targetTexture pixelFormat]];
     else
         sourceTexture = drawableTexture;
@@ -389,7 +390,7 @@
     context_.ResumeRenderEncoder();
 
     /* Decrement reference counter for temporary texture */
-    if (sourceTexture != drawableTexture)
+    if (isTextureViewRequired)
         [sourceTexture release];
 }
 

sources/Renderer/Metal/RenderState/MTConstantsCache.mm

@@ -253,7 +253,6 @@
 {
     NSString* uniformName = [NSString stringWithCString:uniformDesc.name.c_str() encoding:NSASCIIStringEncoding];
     AppendUniformByName(reflection, uniformDesc, uniformIndex, uniformName, shaderBuffers);
-    [uniformName release];
 }
 
 

sources/Renderer/Metal/Shader/MTShader.mm

@@ -206,9 +206,6 @@ static MTLLanguageVersion GetMTLLanguageVersion(const ShaderDescriptor& desc)
         error:              &error
     ];
 
-    if (source != nullptr)
-        [source release];
-
     [dispatchData release];
 
     /* Load shader function with entry point */

sources/Renderer/Metal/Texture/MTRenderTarget.h

@@ -12,6 +12,7 @@
 #import <Metal/Metal.h>
 
 #include <LLGL/RenderTarget.h>
+#include <LLGL/Container/SmallVector.h>
 #include "../RenderState/MTRenderPass.h"
 
 
@@ -67,14 +68,16 @@ class MTRenderTarget final : public RenderTarget
         );
 
         id<MTLTexture> CreateAttachmentTexture(id<MTLDevice> device, MTLPixelFormat pixelFormat);
+        id<MTLTexture> CreateAttachmentTextureView(id<MTLTexture> sourceTexture, MTLPixelFormat pixelFormat);
 
     private:
 
-        Extent2D                    resolution_;
-        MTLRenderPassDescriptor*    nativeRenderPass_           = nullptr; // Cannot be id<>
-        MTLRenderPassDescriptor*    nativeMutableRenderPass_    = nullptr; // Cannot be id<>
-        std::uint32_t               numColorAttachments_        = 0;
-        MTRenderPass                renderPass_;
+        Extent2D                        resolution_;
+        MTLRenderPassDescriptor*        nativeRenderPass_           = nullptr; // Cannot be id<>
+        MTLRenderPassDescriptor*        nativeMutableRenderPass_    = nullptr; // Cannot be id<>
+        std::uint32_t                   numColorAttachments_        = 0;
+        MTRenderPass                    renderPass_;
+        SmallVector<id<MTLTexture>, 2>  internalTextures_; // List of internally created MTLTexture views
 
 };
 

sources/Renderer/Metal/Texture/MTRenderTarget.mm

@@ -107,17 +107,9 @@ static void CopyMTLAttachmentDesc(MTLRenderPassAttachmentDescriptor* dst, const
 
 MTRenderTarget::~MTRenderTarget()
 {
-    #if 0//TODO: code analysis warns about invalid reference counting
-    /* Release all textures */
-    for_range(i, numColorAttachments_)
-        [nativeRenderPass_.colorAttachments[i] release];
-    if (auto attachment = nativeRenderPass_.depthAttachment)
-        [attachment.texture release];
-    if (auto attachment = nativeRenderPass_.stencilAttachment)
-        [attachment.texture release];
-
-    //[nativeRenderPass_ release];
-    #endif
+    /* Release all internally created textures */
+    for (id<MTLTexture> tex : internalTextures_)
+        [tex release];
 }
 
 Extent2D MTRenderTarget::GetResolution() const
@@ -188,12 +180,11 @@ static void CopyMTLAttachmentDesc(MTLRenderPassAttachmentDescriptor* dst, const
         {
             /* Create texture view with format */
             const MTLPixelFormat pixelFormat = MTTypes::ToMTLPixelFormat(inAttachment.format);
-            outAttachment.texture = [tex newTextureViewWithPixelFormat:pixelFormat];
+            outAttachment.texture = CreateAttachmentTextureView(tex, pixelFormat);
         }
         else
         {
-            /* Increment reference counter of texture and use texture directly */
-            [tex retain];
+            /* Use input texture directly */
             outAttachment.texture = tex;
         }
     }
@@ -214,12 +205,11 @@ static void CopyMTLAttachmentDesc(MTLRenderPassAttachmentDescriptor* dst, const
         {
             /* Create texture view with format */
             const MTLPixelFormat pixelFormat = MTTypes::ToMTLPixelFormat(inAttachment.format);
-            outAttachment.resolveTexture = [tex newTextureViewWithPixelFormat:pixelFormat];
+            outAttachment.resolveTexture = CreateAttachmentTextureView(tex, pixelFormat);
         }
         else
         {
-            /* Increment reference counter of texture and use texture directly */
-            [tex retain];
+            /* Use input texture directly */
             outAttachment.resolveTexture = tex;
         }
 
@@ -257,12 +247,20 @@ static void CopyMTLAttachmentDesc(MTLRenderPassAttachmentDescriptor* dst, const
 
 id<MTLTexture> MTRenderTarget::CreateAttachmentTexture(id<MTLDevice> device, MTLPixelFormat pixelFormat)
 {
-    auto texDesc = CreateTextureDesc(device, pixelFormat, renderPass_.GetSampleCount());
+    MTLTextureDescriptor* texDesc = CreateTextureDesc(device, pixelFormat, renderPass_.GetSampleCount());
 
-    id<MTLTexture> texture = [device newTextureWithDescriptor:texDesc];
+    id<MTLTexture> newTexture = [device newTextureWithDescriptor:texDesc];
+    internalTextures_.push_back(newTexture);
     [texDesc release];
 
-    return texture;
+    return newTexture;
+}
+
+id<MTLTexture> MTRenderTarget::CreateAttachmentTextureView(id<MTLTexture> sourceTexture, MTLPixelFormat pixelFormat)
+{
+    id<MTLTexture> newTextureView = [sourceTexture newTextureViewWithPixelFormat:pixelFormat];
+    internalTextures_.push_back(newTextureView);
+    return newTextureView;
 }
 
 

sources/Renderer/Metal/Texture/MTTexture.mm

@@ -396,8 +396,6 @@ static void ConvertTextureDesc(id<MTLDevice> device, MTLTextureDescriptor* dst,
         /* Copy bytes from intermediate shared buffer into output CPU buffer */
         ::memcpy(imageDesc.data, intermediateBuffer.GetBytes(), imageDesc.dataSize);
     }
-
-    [cmdBuffer release];
 }
 
 

sources/Renderer/OpenGL/Shader/GLPipelineSignature.cpp

@@ -31,8 +31,9 @@ static GLuint SortShaderArray(std::size_t numShaders, const Shader* const* shade
     const GLShader* shadersOrderedByType[numShaderTypes] = {};
     for_range(i, numShaders)
     {
-        const auto shaderType   = shaders[i]->GetType();
-        const auto shaderIndex  = static_cast<int>(shaderType);
+        LLGL_ASSERT_PTR(shaders[i]);
+        const ShaderType shaderType = shaders[i]->GetType();
+        const int shaderIndex = static_cast<int>(shaderType);
         LLGL_ASSERT(shadersOrderedByType[shaderIndex] == nullptr, "duplicate definitions of %s shader in one pipeline", ToString(shaderType));
         shadersOrderedByType[shaderIndex] = LLGL_CAST(const GLShader*, shaders[i]);
     }