Branimir Karadžić 5 лет назад
Родитель
Сommit
52a33b8bd3
3 измененных файлов с 10 добавлено и 7 удалено
  1. 3 3
      src/bgfx.cpp
  2. 1 1
      src/renderer_d3d11.cpp
  3. 6 3
      src/shader_dxbc.cpp

+ 3 - 3
src/bgfx.cpp

@@ -3927,9 +3927,9 @@ namespace bgfx
 		dstHeight = bx::min<uint32_t>(dstHeight, _dstY + _height) - _dstY;
 		dstDepth  = bx::min<uint32_t>(dstDepth,  _dstZ + _depth ) - _dstZ;
 
-		uint16_t width  = bx::min<uint16_t>(srcWidth,  dstWidth);
-		uint16_t height = bx::min<uint16_t>(srcHeight, dstHeight);
-		uint16_t depth  = bx::min<uint16_t>(srcDepth,  dstDepth);
+		uint16_t width  = uint16_t(bx::min(srcWidth, dstWidth) );
+		uint16_t height = uint16_t(bx::min(srcHeight, dstHeight) );
+		uint16_t depth  = uint16_t(bx::min(srcDepth,  dstDepth) );
 
 		BGFX_ENCODER(blit(_id, _dst, _dstMip, _dstX, _dstY, _dstZ, _src, _srcMip, _srcX, _srcY, _srcZ, width, height, depth) );
 	}

+ 1 - 1
src/renderer_d3d11.cpp

@@ -4028,7 +4028,7 @@ namespace bgfx { namespace d3d11
 					}
 
 					uint32_t regNum = 0;
-					uint32_t regLen = endPtr - startPtr;
+					uint32_t regLen = uint32_t(endPtr - startPtr);
 					bx::fromString(&regNum, bx::StringView(startPtr, regLen));
 
 					regNum += 16;

+ 6 - 3
src/shader_dxbc.cpp

@@ -2040,23 +2040,26 @@ namespace bgfx
 				chunkOffset[idx] = uint32_t(bx::seek(_writer) - dxbcOffset);
 				size += bx::write(_writer, DXBC_CHUNK_SPDB, _err);
 				size += bx::write(_writer, UINT32_C(0), _err);
-				chunkSize[idx] = bx::write(_writer, _dxbc.spdb.debugCode.data(), _dxbc.spdb.debugCode.size(), _err);
+				chunkSize[idx] = bx::write(_writer, _dxbc.spdb.debugCode.data(), int32_t(_dxbc.spdb.debugCode.size() ), _err);
 				size += chunkSize[idx++];
 				break;
+
 			case DXBC_CHUNK_RDEF: // Resource definition.
 				chunkOffset[idx] = uint32_t(bx::seek(_writer) - dxbcOffset);
 				size += bx::write(_writer, DXBC_CHUNK_RDEF, _err);
 				size += bx::write(_writer, uint32_t(_dxbc.rdef.rdefCode.size()), _err);
-				chunkSize[idx] = bx::write(_writer, _dxbc.rdef.rdefCode.data(), _dxbc.rdef.rdefCode.size(), _err);
+				chunkSize[idx] = bx::write(_writer, _dxbc.rdef.rdefCode.data(), int32_t(_dxbc.rdef.rdefCode.size() ), _err);
 				size += chunkSize[idx++];
 				break;
+
 			case DXBC_CHUNK_STAT: // Statistics.
 				chunkOffset[idx] = uint32_t(bx::seek(_writer) - dxbcOffset);
 				size += bx::write(_writer, DXBC_CHUNK_STAT, _err);
 				size += bx::write(_writer, uint32_t(_dxbc.rdef.rdefCode.size()), _err);
-				chunkSize[idx] = bx::write(_writer, _dxbc.rdef.rdefCode.data(), _dxbc.rdef.rdefCode.size(), _err);
+				chunkSize[idx] = bx::write(_writer, _dxbc.rdef.rdefCode.data(), int32_t(_dxbc.rdef.rdefCode.size() ), _err);
 				size += chunkSize[idx++];
 				break;
+
 			case BX_MAKEFOURCC('A', 'o', 'n', '9'): // Contains DX9BC for feature level 9.x (*s_4_0_level_9_*) shaders.
 			case BX_MAKEFOURCC('I', 'F', 'C', 'E'): // Interface.
 			case BX_MAKEFOURCC('S', 'D', 'G', 'B'): // Shader debugging info (old).