Fix lint warnings

Author: halx99

axmol/3d/Bundle3D.cpp

@@ -894,9 +894,10 @@ bool Bundle3D::loadMaterialsBinary(MaterialDatas& materialdatas)
 {
     if (!seekToFirstType(BUNDLE_TYPE_MATERIAL))
         return false;
-    unsigned int materialnum = 1;
+    
     try
     {
+        unsigned int materialnum = 1;
         _binaryReader.read_blob(materialnum);
         for (unsigned int i = 0; i < materialnum; ++i)
         {

axmol/physics/PhysicsJoint.cpp

@@ -43,7 +43,7 @@ class Optional
 
 public:
     Optional() {}
-    Optional(T d) : _isSet(true), _data(d) {}
+    explicit Optional(T d) : _isSet(true), _data(d) {}
     Optional(const Optional& t) : _isSet(t._isSet), _data(t._data) {}
 
     // bool isNull()       const { return !_isSet; }

axmol/rhi/d3d/DepthStencilStateD3D.cpp

@@ -65,7 +65,7 @@ static D3D11_DEPTH_STENCILOP_DESC make_op_desc(const StencilDescriptor& s)
 
 void DepthStencilStateImpl::update(const DepthStencilDescriptor& desc)
 {
-    if (_state && memcmp(&desc, &_dsDesc, sizeof(desc) == 0))
+    if (_state && memcmp(&desc, &_dsDesc, sizeof(desc)) == 0)
     {
         return;
     }
@@ -115,7 +115,6 @@ void DepthStencilStateImpl::reset(ID3D11DeviceContext* ctx)
 
         dsDesc.StencilEnable = FALSE;
 
-        ID3D11DepthStencilState* pDSStateDisable = nullptr;
         _device->CreateDepthStencilState(&dsDesc, _disableState.GetAddressOf());
     }
 

axmol/rhi/d3d/RenderPipelineD3D.cpp

@@ -144,7 +144,7 @@ static UINT toD3DColorWriteMask(ColorWriteMask mask)
     return result;
 }
 
-static uint64_t hashBlendDesc(const BlendDescriptor& bd)
+static uint32_t hashBlendDesc(const BlendDescriptor& bd)
 {
     struct PODBlend
     {
@@ -157,7 +157,7 @@ static uint64_t hashBlendDesc(const BlendDescriptor& bd)
         uint8_t destinationRGBBlendFactor;
         uint8_t sourceAlphaBlendFactor;
         uint8_t destinationAlphaBlendFactor;
-        uint8_t pad1[4];
+        uint32_t pad1;
     } pod{static_cast<uint32_t>(bd.writeMask),
           static_cast<uint8_t>(bd.blendEnabled),
           static_cast<uint8_t>(bd.rgbBlendOperation),
@@ -167,16 +167,16 @@ static uint64_t hashBlendDesc(const BlendDescriptor& bd)
           static_cast<uint8_t>(bd.destinationRGBBlendFactor),
           static_cast<uint8_t>(bd.sourceAlphaBlendFactor),
           static_cast<uint8_t>(bd.destinationAlphaBlendFactor),
-          {0, 0, 0, 0}};
+          0};
 
-    return XXH64(&pod, sizeof(pod), 0);
+    return XXH32(&pod, sizeof(pod), 0);
 }
 
 void RenderPipelineImpl::update(const RenderTarget*, const PipelineDescriptor& desc)
 {
     ComPtr<ID3D11BlendState> blendState;
 
-    uint64_t key = hashBlendDesc(desc.blendDescriptor);
+    auto key = hashBlendDesc(desc.blendDescriptor);
     auto it      = _blendCache.find(key);
 
     if (it != _blendCache.end())

axmol/rhi/d3d/RenderPipelineD3D.h

@@ -17,6 +17,6 @@ class RenderPipelineImpl : public RenderPipeline
     ID3D11Device* _device         = nullptr;
     ID3D11DeviceContext* _context = nullptr;
 
-    tsl::robin_map<uint64_t, ComPtr<ID3D11BlendState>> _blendCache;
+    tsl::robin_map<uint32_t, ComPtr<ID3D11BlendState>> _blendCache;
 };
 }  // namespace ax::rhi::d3d

axmol/rhi/d3d/TextureD3D.cpp

@@ -418,8 +418,6 @@ void TextureImpl::updateFaceData(TextureCubeFace side, void* data, int index)
     //-------------------------------------------------------------------
     // 2. compute RowPitch / SlicePitch
     //-------------------------------------------------------------------
-    const uint32_t pixelSize        = PixelFormatUtils::getBitsPerPixel(_textureRes._descriptor.textureFormat) / 8;
-    const uint32_t rowPitchVerified = _textureRes._descriptor.width * pixelSize;
     const uint32_t rowPitch =
         PixelFormatUtils::computeRowPitch(_textureFormat, static_cast<uint32_t>(_textureRes._descriptor.width));
     const uint32_t slicePitch = _textureRes._descriptor.height * rowPitch;