Branimir Karadžić 10 years ago
parent
commit
1824a3f5bd

+ 1 - 1
3rdparty/glsl-optimizer/autogen.sh

@@ -5563,7 +5563,7 @@ static bool InputTextFilterCharacter(unsigned int* p_char, ImGuiInputTextFlags f
         ImGuiTextEditCallbackData callback_data;
         memset(&callback_data, 0, sizeof(ImGuiTextEditCallbackData));
         callback_data.EventFlag = ImGuiInputTextFlags_CallbackCharFilter;
-        callback_data.EventChar = c;
+        callback_data.EventChar = ImWchar(c);
         callback_data.Flags = flags;
         callback_data.UserData = user_data;
         if (callback(&callback_data) != 0)

+ 2 - 0
examples/common/imgui/imgui.cpp

@@ -50,6 +50,8 @@
 // embedded font
 #include "droidsans.ttf.h"
 
+BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4244); // warning C4244: '=' : conversion from '' to '', possible loss of data
+
 #define USE_NANOVG_FONT 0
 
 #define IMGUI_CONFIG_MAX_FONTS 20

+ 2 - 0
examples/common/nanovg/nanovg_bgfx.cpp

@@ -32,6 +32,8 @@
 
 #include <bx/bx.h>
 
+BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4244); // warning C4244: '=' : conversion from '' to '', possible loss of data
+
 namespace
 {
 #include "vs_nanovg_fill.bin.h"

+ 4 - 0
include/bgfxplatform.h

@@ -627,6 +627,7 @@ namespace bgfx { namespace d3d11
 
 				if (SUCCEEDED(hr) )
 				{
+#if BX_COMPILER_MSVC
 BX_PRAGMA_DIAGNOSTIC_PUSH();
 BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4530) // warning C4530: C++ exception handler used, but unwind semantics are not enabled. Specify /EHsc
 					try
@@ -641,6 +642,9 @@ BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4530) // warning C4530: C++ exception handler
 						hr = E_FAIL;
 					}
 BX_PRAGMA_DIAGNOSTIC_POP();
+#else
+					hr = device->GetAdapter(&adapter);
+#endif // BX_COMPILER_MSVC
 				}
 			}
 			BGFX_FATAL(SUCCEEDED(hr), Fatal::UnableToInitialize, "Unable to create Direct3D11 device.");