mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić 2015-04-08 14:16:02 -07:00
parent 6fe02e7815
commit 1824a3f5bd
7 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
3rdparty/glsl-optimizer/autogen.sh vendored Executable file → Normal file
View File

0
3rdparty/glsl-optimizer/generateParsers.sh vendored Executable file → Normal file
View File

2
3rdparty/ocornut-imgui/imgui.cpp vendored
View File

@ -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
examples/common/imgui/imgui.cpp
View File

@ -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
examples/common/nanovg/nanovg_bgfx.cpp
View File

@ -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"

0
include/bgfxplatform.h Executable file → Normal file
View File

4
src/renderer_d3d11.cpp
View File

@ -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.");