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

D3D1x: Fixed blend factor logic. Issue #732.

Browse Source
This commit is contained in:
Branimir Karadžić
2016-03-27 22:36:52 -07:00
parent bac219debc
commit 058b720a4e
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/renderer_d3d11.cpp
View File

@@ -2705,11 +2705,11 @@ BX_PRAGMA_DIAGNOSTIC_POP();
m_blendStateCache.add(hash, bs);
}
const uint64_t f0 = BGFX_STATE_BLEND_FUNC(BGFX_STATE_BLEND_FACTOR, BGFX_STATE_BLEND_FACTOR);
const uint64_t f1 = BGFX_STATE_BLEND_FUNC(BGFX_STATE_BLEND_INV_FACTOR, BGFX_STATE_BLEND_INV_FACTOR);
bool hasFactor = false
|| f0 == (_state & f0)
|| f1 == (_state & f1)
bool hasFactor = 0
|| 0 != (_state & BGFX_STATE_BLEND_FACTOR )
|| 0 != (_state & BGFX_STATE_BLEND_INV_FACTOR )
|| 0 != (_state & (BGFX_STATE_BLEND_FACTOR <<4) )
|| 0 != (_state & (BGFX_STATE_BLEND_INV_FACTOR<<4) )
;
float blendFactor[4] = { 1.0f, 1.0f, 1.0f, 1.0f };

9
src/renderer_d3d12.cpp
View File

@@ -4629,9 +4629,6 @@ data.NumQualityLevels = 0;
m_backBufferColorIdx = m_swapChain->GetCurrentBackBufferIndex();
#endif // BX_PLATFORM_WINDOWS
const uint64_t f0 = BGFX_STATE_BLEND_FUNC(BGFX_STATE_BLEND_FACTOR, BGFX_STATE_BLEND_FACTOR);
const uint64_t f1 = BGFX_STATE_BLEND_FUNC(BGFX_STATE_BLEND_INV_FACTOR, BGFX_STATE_BLEND_INV_FACTOR);
D3D12_GPU_DESCRIPTOR_HANDLE gpuHandle;
ScratchBufferD3D12& scratchBuffer = m_scratchBuffer[m_backBufferColorIdx];
scratchBuffer.reset(gpuHandle);
@@ -5027,8 +5024,10 @@ data.NumQualityLevels = 0;
{
const uint64_t state = draw.m_stateFlags;
bool hasFactor = 0
|| f0 == (state & f0)
|| f1 == (state & f1)
|| 0 != (state & BGFX_STATE_BLEND_FACTOR )
|| 0 != (state & BGFX_STATE_BLEND_INV_FACTOR )
|| 0 != (state & (BGFX_STATE_BLEND_FACTOR <<4) )
|| 0 != (state & (BGFX_STATE_BLEND_INV_FACTOR<<4) )
;
const VertexBufferD3D12& vb = m_vertexBuffers[draw.m_vertexBuffer.idx];