Branimir Karadžić 7 ani în urmă
părinte
comite
b4229e4a17
2 a modificat fișierele cu 1 adăugiri și 7 ștergeri
  1. 1 1
      examples/common/nanovg/fontstash.h
  2. 0 6
      src/renderer_d3d12.cpp

+ 1 - 1
examples/common/nanovg/fontstash.h

@@ -903,7 +903,7 @@ int fonsAddFont(FONScontext* stash, const char* name, const char* path)
 	fp = 0;
 	if (readed != dataSize) goto error;
 
-	return fonsAddFontMem(stash, name, data, dataSize, 1);
+	return fonsAddFontMem(stash, name, data, int(dataSize), 1);
 
 error:
 	if (data) free(data);

+ 0 - 6
src/renderer_d3d12.cpp

@@ -4626,7 +4626,6 @@ data.NumQualityLevels = 0;
 						{
 							const uint32_t pitch = bx::strideAlign(mip.m_width*mip.m_bpp / 8, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT);
 							const uint32_t slice = bx::strideAlign(mip.m_height*pitch,        D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT);
-							const uint32_t size  = slice*depth;
 
 							uint8_t* temp = (uint8_t*)BX_ALLOC(g_allocator, slice*depth);
 							bimg::imageCopy(temp
@@ -4644,11 +4643,6 @@ data.NumQualityLevels = 0;
 
 						++kk;
 					}
-					else
-					{
-						const uint32_t pitch = bx::strideAlign(width*bpp / 8, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT);
-						const uint32_t slice = bx::strideAlign(height*pitch,  D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT);
-					}
 
 					width  >>= 1;
 					height >>= 1;