Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix independent blend parameter on Vulkan, D3d11 and D3d12 #3035

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix independent blend parameter on Vulkan, D3d11 and D3d12 #3035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/renderer_d3d11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5955,7 +5955,7 @@ namespace bgfx { namespace d3d11

currentBind.clear();

setBlendState(newFlags);
setBlendState(newFlags, draw.m_rgba);
setDepthStencilState(newFlags, packStencil(BGFX_STENCIL_DEFAULT, BGFX_STENCIL_DEFAULT) );

const uint64_t pt = newFlags&BGFX_STATE_PT_MASK;
Expand Down
5 changes: 4 additions & 1 deletion src/renderer_d3d12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2185,6 +2185,7 @@ namespace bgfx { namespace d3d12

const VertexLayout* layouts[1] = { &m_vertexLayouts[_blitter.m_vb->layoutHandle.idx] };
ID3D12PipelineState* pso = getPipelineState(state
, 0
, packStencil(BGFX_STENCIL_DEFAULT, BGFX_STENCIL_DEFAULT)
, 1
, layouts
Expand Down Expand Up @@ -3047,6 +3048,7 @@ namespace bgfx { namespace d3d12

ID3D12PipelineState* getPipelineState(
uint64_t _state
, uint64_t _rgba
, uint64_t _stencil
, uint8_t _numStreams
, const VertexLayout** _layouts
Expand Down Expand Up @@ -3216,7 +3218,7 @@ namespace bgfx { namespace d3d12
desc.StreamOutput.NumStrides = 0;
desc.StreamOutput.RasterizedStream = 0;

setBlendState(desc.BlendState, _state);
setBlendState(desc.BlendState, _state, _rgba);
desc.SampleMask = UINT32_MAX;
setRasterizerState(desc.RasterizerState, _state);
setDepthStencilState(desc.DepthStencilState, _state, _stencil);
Expand Down Expand Up @@ -6879,6 +6881,7 @@ namespace bgfx { namespace d3d12

ID3D12PipelineState* pso = getPipelineState(
state
, draw.m_rgba
, draw.m_stencil
, numStreams
, layouts
Expand Down
6 changes: 4 additions & 2 deletions src/renderer_vk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2592,6 +2592,7 @@ VK_IMPORT_DEVICE

const VertexLayout* layout = &m_vertexLayouts[_blitter.m_vb->layoutHandle.idx];
VkPipeline pso = getPipeline(state
, 0
, packStencil(BGFX_STENCIL_DEFAULT, BGFX_STENCIL_DEFAULT)
, 1
, &layout
Expand Down Expand Up @@ -3525,7 +3526,7 @@ VK_IMPORT_DEVICE
return pipeline;
}

VkPipeline getPipeline(uint64_t _state, uint64_t _stencil, uint8_t _numStreams, const VertexLayout** _layouts, ProgramHandle _program, uint8_t _numInstanceData)
VkPipeline getPipeline(uint64_t _state, uint64_t _rgba, uint64_t _stencil, uint8_t _numStreams, const VertexLayout** _layouts, ProgramHandle _program, uint8_t _numInstanceData)
{
ProgramVK& program = m_program[_program.idx];

Expand Down Expand Up @@ -3597,7 +3598,7 @@ VK_IMPORT_DEVICE
VkPipelineColorBlendAttachmentState blendAttachmentState[BGFX_CONFIG_MAX_FRAME_BUFFER_ATTACHMENTS];
VkPipelineColorBlendStateCreateInfo colorBlendState;
colorBlendState.pAttachments = blendAttachmentState;
setBlendState(colorBlendState, _state);
setBlendState(colorBlendState, _state, _rgba);

VkPipelineInputAssemblyStateCreateInfo inputAssemblyState;
inputAssemblyState.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
Expand Down Expand Up @@ -8549,6 +8550,7 @@ VK_DESTROY

const VkPipeline pipeline =
getPipeline(draw.m_stateFlags
, draw.m_rgba
, draw.m_stencil
, numStreams
, layouts
Expand Down