scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-25 09:08:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup.

Browse source
This commit is contained in:
Branimir Karadžić 2015-10-15 20:17:07 -07:00
parent 60c7072558
commit a5934b93e9
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/bgfx.cpp
View file

@ -1594,8 +1594,8 @@ again:
if (windowsVersionIs(Condition::GreaterEqual, 0x0602) ) if (windowsVersionIs(Condition::GreaterEqual, 0x0602) )
{ {
first = RendererType::Direct3D12; first = RendererType::Direct3D11;
second = RendererType::Direct3D11; second = RendererType::Direct3D12;
if (!s_rendererCreator[second].supported) if (!s_rendererCreator[second].supported)
{ {
second = RendererType::Direct3D9; second = RendererType::Direct3D9;
@ -1662,7 +1662,7 @@ again:
} }
else else
{ {
#if 1 #if 0
if (s_rendererCreator[RendererType::Metal].supported) if (s_rendererCreator[RendererType::Metal].supported)
{ {
_type = RendererType::Metal; _type = RendererType::Metal;

7
src/renderer_d3d11.cpp
View file

@ -3905,7 +3905,8 @@ BX_PRAGMA_DIAGNOSTIC_POP();
const bool bufferOnly = 0 != (m_flags&BGFX_TEXTURE_RT_BUFFER_ONLY); const bool bufferOnly = 0 != (m_flags&BGFX_TEXTURE_RT_BUFFER_ONLY);
const bool computeWrite = 0 != (m_flags&BGFX_TEXTURE_COMPUTE_WRITE); const bool computeWrite = 0 != (m_flags&BGFX_TEXTURE_COMPUTE_WRITE);
const bool renderTarget = 0 != (m_flags&BGFX_TEXTURE_RT_MASK); const bool renderTarget = 0 != (m_flags&BGFX_TEXTURE_RT_MASK);
const bool srgb = 0 != (m_flags&BGFX_TEXTURE_SRGB) || imageContainer.m_srgb; const bool srgb = 0 != (m_flags&BGFX_TEXTURE_SRGB) || imageContainer.m_srgb;
const bool blit = 0 != (m_flags&BGFX_TEXTURE_BLIT_DST);
const uint32_t msaaQuality = bx::uint32_satsub( (m_flags&BGFX_TEXTURE_RT_MSAA_MASK)>>BGFX_TEXTURE_RT_MSAA_SHIFT, 1); const uint32_t msaaQuality = bx::uint32_satsub( (m_flags&BGFX_TEXTURE_RT_MSAA_MASK)>>BGFX_TEXTURE_RT_MSAA_SHIFT, 1);
const DXGI_SAMPLE_DESC& msaa = s_msaa[msaaQuality]; const DXGI_SAMPLE_DESC& msaa = s_msaa[msaaQuality];
@ -3943,7 +3944,7 @@ BX_PRAGMA_DIAGNOSTIC_POP();
desc.MipLevels = numMips; desc.MipLevels = numMips;
desc.Format = format; desc.Format = format;
desc.SampleDesc = msaa; desc.SampleDesc = msaa;
desc.Usage = kk == 0 ? D3D11_USAGE_DEFAULT : D3D11_USAGE_IMMUTABLE; desc.Usage = kk == 0 || blit ? D3D11_USAGE_DEFAULT : D3D11_USAGE_IMMUTABLE;
desc.BindFlags = bufferOnly ? 0 : D3D11_BIND_SHADER_RESOURCE; desc.BindFlags = bufferOnly ? 0 : D3D11_BIND_SHADER_RESOURCE;
desc.CPUAccessFlags = 0; desc.CPUAccessFlags = 0;
@ -3991,7 +3992,7 @@ BX_PRAGMA_DIAGNOSTIC_POP();
desc.Depth = imageContainer.m_depth; desc.Depth = imageContainer.m_depth;
desc.MipLevels = imageContainer.m_numMips; desc.MipLevels = imageContainer.m_numMips;
desc.Format = format; desc.Format = format;
desc.Usage = kk == 0 ? D3D11_USAGE_DEFAULT : D3D11_USAGE_IMMUTABLE; desc.Usage = kk == 0 || blit ? D3D11_USAGE_DEFAULT : D3D11_USAGE_IMMUTABLE;
desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
desc.CPUAccessFlags = 0; desc.CPUAccessFlags = 0;
desc.MiscFlags = 0; desc.MiscFlags = 0;