scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-29 02:55:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #150 from mmicko/master

Browse source 
Made Windows7 build default for x64 Windows platform and fixed DX11 compile
This commit is contained in:
Branimir Karadžić 2014-09-18 19:16:38 -07:00
commit b650d979b9
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/bgfx.lua
View file

@ -60,6 +60,11 @@ function bgfxProject(_name, _kind, _defines)
BGFX_DIR .. "3rdparty/khronos", BGFX_DIR .. "3rdparty/khronos",
} }
configuration { "x64", "vs* or mingw" }
defines {
"_WIN32_WINNT=0x601",
}
configuration {} configuration {}
includedirs { includedirs {

9
src/renderer_d3d11.cpp
View file

@ -115,7 +115,7 @@ namespace bgfx
D3D11_CULL_BACK, D3D11_CULL_BACK,
}; };
static DXGI_FORMAT s_colorFormat[] = /*static DXGI_FORMAT s_colorFormat[] =
{ {
DXGI_FORMAT_UNKNOWN, // ignored DXGI_FORMAT_UNKNOWN, // ignored
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM,
@ -124,7 +124,7 @@ namespace bgfx
DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_FLOAT,
DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_FLOAT,
}; };*/
static const DXGI_FORMAT s_depthFormat[] = static const DXGI_FORMAT s_depthFormat[] =
{ {
@ -578,7 +578,7 @@ namespace bgfx
if (BX_ENABLED(BGFX_CONFIG_DEBUG) ) if (BX_ENABLED(BGFX_CONFIG_DEBUG) )
{ {
ID3D11InfoQueue* infoQueue; ID3D11InfoQueue* infoQueue;
hr = m_device->QueryInterface(__uuidof(ID3D11InfoQueue), (void**)&infoQueue); hr = m_device->QueryInterface(IID_ID3D11InfoQueue, (void**)&infoQueue);
if (SUCCEEDED(hr) ) if (SUCCEEDED(hr) )
{ {
@ -2105,6 +2105,7 @@ namespace bgfx
, regIndex , regIndex
, regCount , regCount
); );
BX_UNUSED(kind);
} }
m_constantBuffer->finish(); m_constantBuffer->finish();
@ -2767,7 +2768,7 @@ namespace bgfx
commitShaderConstants(); commitShaderConstants();
} }
} }
BX_UNUSED(programChanged);
ID3D11UnorderedAccessView* uav[BGFX_MAX_COMPUTE_BINDINGS] = {}; ID3D11UnorderedAccessView* uav[BGFX_MAX_COMPUTE_BINDINGS] = {};
ID3D11ShaderResourceView* srv[BGFX_MAX_COMPUTE_BINDINGS] = {}; ID3D11ShaderResourceView* srv[BGFX_MAX_COMPUTE_BINDINGS] = {};
ID3D11SamplerState* sampler[BGFX_CONFIG_MAX_TEXTURE_SAMPLERS] = {}; ID3D11SamplerState* sampler[BGFX_CONFIG_MAX_TEXTURE_SAMPLERS] = {};

6
src/renderer_d3d11.h
View file

@ -44,7 +44,7 @@ namespace bgfx
Ty* find(uint64_t _id) Ty* find(uint64_t _id)
{ {
HashMap::iterator it = m_hashMap.find(_id); typename HashMap::iterator it = m_hashMap.find(_id);
if (it != m_hashMap.end() ) if (it != m_hashMap.end() )
{ {
return it->second; return it->second;
@ -55,7 +55,7 @@ namespace bgfx
void invalidate(uint64_t _id) void invalidate(uint64_t _id)
{ {
HashMap::iterator it = m_hashMap.find(_id); typename HashMap::iterator it = m_hashMap.find(_id);
if (it != m_hashMap.end() ) if (it != m_hashMap.end() )
{ {
DX_RELEASE_WARNONLY(it->second, 0); DX_RELEASE_WARNONLY(it->second, 0);
@ -65,7 +65,7 @@ namespace bgfx
void invalidate() void invalidate()
{ {
for (HashMap::iterator it = m_hashMap.begin(), itEnd = m_hashMap.end(); it != itEnd; ++it) for (typename HashMap::iterator it = m_hashMap.begin(), itEnd = m_hashMap.end(); it != itEnd; ++it)
{ {
DX_CHECK_REFCOUNT(it->second, 1); DX_CHECK_REFCOUNT(it->second, 1);
it->second->Release(); it->second->Release();