Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-17 20:52:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed MSVC warnings.

Browse Source
This commit is contained in:
Branimir Karadžić
2025-08-23 19:54:01 -07:00
parent cbe6789a93
commit 30331f4142
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/common/nanovg/nanovg.cpp
View File

@@ -26,13 +26,13 @@
#include <bx/bx.h> #include <bx/bx.h>
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4701) // error C4701: potentially uninitialized local variable 'cint' used BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4701) // error C4701: potentially uninitialized local variable 'cint' used
// -Wunused-function and 4505 must be file scope, can't be disabled between push/pop. BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-function"); // -Wunused-function and 4505 must be file scope, can't be disabled between push/pop.
BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-function");
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4505) // error C4505: '' : unreferenced local function has been removed BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4505) // error C4505: '' : unreferenced local function has been removed
BX_PRAGMA_DIAGNOSTIC_PUSH(); BX_PRAGMA_DIAGNOSTIC_PUSH();
BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-parameter"); BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-parameter");
BX_PRAGMA_DIAGNOSTIC_IGNORED_GCC("-Wunused-result"); BX_PRAGMA_DIAGNOSTIC_IGNORED_GCC("-Wunused-result");
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4244); //" warning C4244: 'argument': conversion from 'double' to 'float', possible loss of data
#define FONTSTASH_IMPLEMENTATION #define FONTSTASH_IMPLEMENTATION
#include "fontstash.h" #include "fontstash.h"
BX_PRAGMA_DIAGNOSTIC_POP(); BX_PRAGMA_DIAGNOSTIC_POP();

6
src/renderer_vk.cpp
View File

@@ -4379,7 +4379,7 @@ VK_IMPORT_DEVICE
{ {
// Check LRU cache. // Check LRU cache.
int memoryType = selectMemoryType(requirements->memoryTypeBits, propertyFlags, 0); int memoryType = selectMemoryType(requirements->memoryTypeBits, propertyFlags, 0);
bool found = m_memoryLru.find(requirements->size, memoryType, memory); bool found = m_memoryLru.find(bx::narrowCast<uint32_t>(requirements->size), memoryType, memory);
if (found) if (found)
{ {
return VK_SUCCESS; return VK_SUCCESS;
@@ -4404,7 +4404,7 @@ VK_IMPORT_DEVICE
BGFX_PROFILER_SCOPE("vkAllocateMemory", kColorResource); BGFX_PROFILER_SCOPE("vkAllocateMemory", kColorResource);
ma.memoryTypeIndex = searchIndex; ma.memoryTypeIndex = searchIndex;
memory->memoryTypeIndex = searchIndex; memory->memoryTypeIndex = searchIndex;
memory->size = ma.allocationSize; memory->size = bx::narrowCast<uint32_t>(ma.allocationSize);
memory->offset = 0; memory->offset = 0;
result = vkAllocateMemory(m_device, &ma, m_allocatorCb, &memory->mem); result = vkAllocateMemory(m_device, &ma, m_allocatorCb, &memory->mem);
} }
@@ -4750,7 +4750,7 @@ VK_DESTROY
// with a handful of tiny allocations. // with a handful of tiny allocations.
if (alloc.size >= _size && _size * 2 >= alloc.size) if (alloc.size >= _size && _size * 2 >= alloc.size)
{ {
uint32_t waste = alloc.size - _size; uint32_t waste = bx::narrowCast<uint32_t>(alloc.size - _size);
if (waste < bestWaste) if (waste < bestWaste)
{ {
bestIdx = slot; bestIdx = slot;