Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-21 06:13:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

D3D11: Fixed backbuffer MSAA.

Browse Source
This commit is contained in:
Branimir Karadžić
2018-08-24 20:46:58 -07:00
parent ce8840993b
commit 6c8468cbce
3 changed files with 60 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/dxgi.cpp
View File

@@ -456,7 +456,8 @@ namespace bgfx
scd.BufferDesc.Format = _scd.format;
scd.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED;
scd.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED;
scd.SampleDesc = _scd.sampleDesc;
scd.SampleDesc.Count = 1;
scd.SampleDesc.Quality = 0;
scd.BufferUsage = _scd.bufferUsage;
scd.BufferCount = _scd.bufferCount;
scd.OutputWindow = (HWND)_scd.nwh;
@@ -467,12 +468,6 @@ namespace bgfx
| (allowTearing ? DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING : 0)
;
if (isType(_device, IID_ID3D12CommandQueue) )
{
scd.SampleDesc.Count = 1;
scd.SampleDesc.Quality = 0;
}
hr = m_factory->CreateSwapChain(
_device
, &scd
@@ -484,7 +479,8 @@ namespace bgfx
scd.Height = _scd.height;
scd.Format = _scd.format;
scd.Stereo = _scd.stereo;
scd.SampleDesc = _scd.sampleDesc;
scd.SampleDesc.Count = 1;
scd.SampleDesc.Quality = 0;
scd.BufferUsage = _scd.bufferUsage;
scd.BufferCount = _scd.bufferCount;
scd.Scaling = _scd.scaling;
@@ -492,12 +488,6 @@ namespace bgfx
scd.AlphaMode = _scd.alphaMode;
scd.Flags = _scd.flags;
if (isType(_device, IID_ID3D12CommandQueue) )
{
scd.SampleDesc.Count = 1;
scd.SampleDesc.Quality = 0;
}
if (NULL == _scd.ndt)
{
hr = m_factory->CreateSwapChainForCoreWindow(

72
src/renderer_d3d11.cpp
View File

@@ -996,6 +996,9 @@ namespace bgfx { namespace d3d11
, m_scd
, &m_swapChain
);
m_msaaRt = NULL;
if (FAILED(hr) )
{
// DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL is not available on win7
@@ -1019,6 +1022,22 @@ namespace bgfx { namespace d3d11
m_textVideoMem.clear();
}
if (1 < m_scd.sampleDesc.Count)
{
D3D11_TEXTURE2D_DESC desc;
desc.Width = m_scd.width;
desc.Height = m_scd.height;
desc.MipLevels = 1;
desc.ArraySize = 1;
desc.Format = m_scd.format;
desc.SampleDesc = m_scd.sampleDesc;
desc.Usage = D3D11_USAGE_DEFAULT;
desc.BindFlags = D3D11_BIND_RENDER_TARGET;
desc.CPUAccessFlags = 0;
desc.MiscFlags = 0;
DX_CHECK(m_device->CreateTexture2D(&desc, NULL, &m_msaaRt) );
}
#if BX_PLATFORM_WINDOWS
DX_CHECK(m_dxgi.m_factory->MakeWindowAssociation( (HWND)g_platformData.nwh, 0
| DXGI_MWA_NO_WINDOW_CHANGES
@@ -1485,6 +1504,7 @@ namespace bgfx { namespace d3d11
switch (errorState)
{
case ErrorState::LoadedDXGI:
DX_RELEASE(m_msaaRt, 0);
DX_RELEASE(m_swapChain, 0);
DX_RELEASE(m_deviceCtx, 0);
DX_RELEASE(m_device, 0);
@@ -1570,6 +1590,7 @@ namespace bgfx { namespace d3d11
}
DX_RELEASE(m_annotation, 1);
DX_RELEASE(m_msaaRt, 0);
DX_RELEASE(m_swapChain, 0);
DX_RELEASE(m_deviceCtx, 0);
DX_RELEASE(m_device, 0);
@@ -2065,8 +2086,11 @@ namespace bgfx { namespace d3d11
{
if (NULL != m_swapChain)
{
ID3D11Texture2D* color;
DX_CHECK(m_swapChain->GetBuffer(0, IID_ID3D11Texture2D, (void**)&color) );
ID3D11Texture2D* backBufferColor = NULL;
if (NULL == m_msaaRt)
{
DX_CHECK(m_swapChain->GetBuffer(0, IID_ID3D11Texture2D, (void**)&backBufferColor) );
}
D3D11_RENDER_TARGET_VIEW_DESC desc;
desc.ViewDimension = (m_resolution.reset & BGFX_RESET_MSAA_MASK)
@@ -2079,8 +2103,8 @@ namespace bgfx { namespace d3d11
: m_scd.format
;
DX_CHECK(m_device->CreateRenderTargetView(color, &desc, &m_backBufferColor) );
DX_RELEASE(color, 0);
DX_CHECK(m_device->CreateRenderTargetView(NULL == m_msaaRt ? backBufferColor : m_msaaRt, &desc, &m_backBufferColor) );
DX_RELEASE(backBufferColor, 0);
}
if (m_timerQuerySupport)
@@ -2111,7 +2135,7 @@ namespace bgfx { namespace d3d11
m_deviceCtx->OMSetRenderTargets(1, &m_backBufferColor, m_backBufferDepthStencil);
m_currentColor = m_backBufferColor;
m_currentColor = m_backBufferColor;
m_currentDepthStencil = m_backBufferDepthStencil;
for (uint32_t ii = 0; ii < BX_COUNTOF(m_frameBuffers); ++ii)
@@ -2298,6 +2322,8 @@ namespace bgfx { namespace d3d11
}
else
{
DX_RELEASE(m_msaaRt, 0);
if (resize)
{
m_deviceCtx->OMSetRenderTargets(1, s_zero.m_rtv, NULL);
@@ -2311,17 +2337,6 @@ namespace bgfx { namespace d3d11
DX_RELEASE(m_swapChain, 0);
if (m_scd.sampleDesc.Count != 1)
{
m_scd.swapEffect = DXGI_SWAP_EFFECT_DISCARD;
m_scd.bufferCount = 1;
}
else
{
m_scd.swapEffect = m_swapEffect;
m_scd.bufferCount = m_swapBufferCount;
}
HRESULT hr;
hr = m_dxgi.createSwapChain(m_device
, m_scd
@@ -2329,6 +2344,22 @@ namespace bgfx { namespace d3d11
);
BGFX_FATAL(SUCCEEDED(hr), bgfx::Fatal::UnableToInitialize, "Failed to create swap chain.");
}
if (1 < m_scd.sampleDesc.Count)
{
D3D11_TEXTURE2D_DESC desc;
desc.Width = m_scd.width;
desc.Height = m_scd.height;
desc.MipLevels = 1;
desc.ArraySize = 1;
desc.Format = m_scd.format;
desc.SampleDesc = m_scd.sampleDesc;
desc.Usage = D3D11_USAGE_DEFAULT;
desc.BindFlags = D3D11_BIND_RENDER_TARGET;
desc.CPUAccessFlags = 0;
desc.MiscFlags = 0;
DX_CHECK(m_device->CreateTexture2D(&desc, NULL, &m_msaaRt) );
}
}
postReset();
@@ -3320,6 +3351,7 @@ namespace bgfx { namespace d3d11
D3D_FEATURE_LEVEL m_featureLevel;
Dxgi::SwapChainI* m_swapChain;
ID3D11Texture2D* m_msaaRt;
bool m_needPresent;
bool m_lost;
@@ -6214,6 +6246,14 @@ namespace bgfx { namespace d3d11
}
m_deviceCtx->OMSetRenderTargets(1, s_zero.m_rtv, NULL);
if (NULL != m_msaaRt)
{
ID3D11Texture2D* backBufferColor;
DX_CHECK(m_swapChain->GetBuffer(0, IID_ID3D11Texture2D, (void**)&backBufferColor) );
deviceCtx->ResolveSubresource(backBufferColor, 0, m_msaaRt, 0, m_scd.format);
DX_RELEASE(backBufferColor, 0);
}
}
} /* namespace d3d11 */ } // namespace bgfx

1
src/renderer_d3d12.cpp
View File

@@ -2132,7 +2132,6 @@ namespace bgfx { namespace d3d12
DX_RELEASE(m_msaaRt, 0);
BX_UNUSED(resize);
if (resize)
{
#if BX_PLATFORM_WINDOWS