scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 18:45:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:bkaradzic/bgfx

Browse source
This commit is contained in:
Branimir Karadžić 2015-02-06 09:03:50 -08:00
commit ae943ade03
3 changed files with 334 additions and 333 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

634
3rdparty/ocornut-imgui/imgui.cpp vendored
View file

File diff suppressed because it is too large Load diff

30
examples/common/entry/entry_osx.mm
View file

@ -57,21 +57,21 @@ namespace entry
static int32_t threadFunc(void* _userData)
{
CFBundleRef mainBundle = CFBundleGetMainBundle();
if ( mainBundle != nil )
{
CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL(mainBundle);
if ( resourcesURL != nil )
{
char path[PATH_MAX];
if (CFURLGetFileSystemRepresentation(resourcesURL, TRUE, (UInt8 *)path, PATH_MAX) )
{
chdir(path);
}
CFRelease(resourcesURL);
}
}
CFBundleRef mainBundle = CFBundleGetMainBundle();
if ( mainBundle != nil )
{
CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL(mainBundle);
if ( resourcesURL != nil )
{
char path[PATH_MAX];
if (CFURLGetFileSystemRepresentation(resourcesURL, TRUE, (UInt8 *)path, PATH_MAX) )
{
chdir(path);
}
CFRelease(resourcesURL);
}
}
MainThreadEntry* self = (MainThreadEntry*)_userData;
return main(self->m_argc, self->m_argv);
}

3
src/renderer_d3d11.cpp
View file

@ -345,6 +345,7 @@ namespace bgfx
static const GUID IID_IDXGIDevice2 = { 0x05008617, 0xfbfd, 0x4051, { 0xa7, 0x90, 0x14, 0x48, 0x84, 0xb4, 0xf6, 0xa9 } };
static const GUID IID_IDXGIDevice3 = { 0x6007896c, 0x3244, 0x4afd, { 0xbf, 0x18, 0xa6, 0xd3, 0xbe, 0xda, 0x50, 0x23 } };
static const GUID IID_IDXGIAdapter = { 0x2411e7e1, 0x12ac, 0x4ccf, { 0xbd, 0x14, 0x97, 0x98, 0xe8, 0x53, 0x4d, 0xc0 } };
static const GUID IID_ID3D11InfoQueue = { 0x6543dbb6, 0x1b48, 0x42f5, { 0xab, 0x82, 0xe9, 0x7e, 0xc7, 0x43, 0x26, 0xf6 } };
static const GUID s_deviceIIDs[] =
{
@ -669,7 +670,7 @@ namespace bgfx
if (BX_ENABLED(BGFX_CONFIG_DEBUG) )
{
ID3D11InfoQueue* infoQueue;
hr = m_device->QueryInterface(__uuidof(ID3D11InfoQueue), (void**)&infoQueue);
hr = m_device->QueryInterface(IID_ID3D11InfoQueue, (void**)&infoQueue);
if (SUCCEEDED(hr) )
{