Merge branch 'dev' into camera-refactor

Author: halx99

axmol/3d/Bundle3D.cpp

@@ -739,7 +739,7 @@ bool Bundle3D::loadMeshDatasJson(MeshDatas& meshdatas)
         auto&& mesh_data_vertex_array = mesh_data[VERTICES].get_array();
         for (auto&& vertex_val : mesh_data_vertex_array)
         {
-            meshData->vertex.emplace_back(static_cast<double>(vertex_val));
+            meshData->vertex.emplace_back(static_cast<float>(vertex_val.get_double().value()));
         }
         meshData->vertexSizeInFloat = meshData->vertex.size();
         // mesh part

axmol/rhi/VertexLayout.cpp

@@ -158,7 +158,8 @@ void VertexLayoutDesc::addAttrib(const VertexInputDesc* desc,
     else
         _strides[1] += static_cast<uint32_t>(sizeInBytes);
 
-    _bindings.emplace_back(desc->semantic.name, desc->location, format, offset, needToBeNormallized, instanceStepRate);
+    _bindings.emplace_back(desc->semantic.name, desc->location, format, static_cast<unsigned int>(offset),
+                           needToBeNormallized, instanceStepRate);
 }
 
 }  // namespace ax::rhi

axmol/rhi/d3d11/Texture11.cpp

@@ -228,9 +228,10 @@ void TextureImpl::updateCompressedSubData(int xoffset,
     box.bottom = static_cast<UINT>(yoffset + height);
     box.back   = 1;
 
-    auto context     = static_cast<DriverImpl*>(axdrv)->getContext();
-    UINT subresource = D3D11CalcSubresource(level, layerIndex, _desc.mipLevels);
-    context->UpdateSubresource(_nativeTexture, subresource, &box, data, 0, 0);
+    auto context        = static_cast<DriverImpl*>(axdrv)->getContext();
+    UINT subresource    = D3D11CalcSubresource(level, layerIndex, _desc.mipLevels);
+    const auto rowPitch = RHIUtils::computeRowPitch(_desc.pixelFormat, width);
+    context->UpdateSubresource(_nativeTexture, subresource, &box, data, rowPitch, 0);
 
     if (shouldGenMipmaps(level))
         generateMipmaps(context);