archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 17:58:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

d3d12: Some fix for creation of PSO

Browse source
This commit is contained in:
vlj 2015-05-11 19:08:39 +02:00 • committed by Vincent Lejeune
parent 34bf82d81c
commit c6e2f070ee
1 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp
View file

@ -152,9 +152,9 @@ ID3D12PipelineState *PipelineStateObjectCache::getGraphicPipelineState(ID3D12Dev
} }
else else
{ {
LOG_WARNING(RSX, "Add program :"); /* LOG_WARNING(RSX, "Add program :");
LOG_WARNING(RSX, "*** vp id = %d", m_vertex_prog.Id); LOG_WARNING(RSX, "*** vp id = %d", m_vertex_prog.Id);
LOG_WARNING(RSX, "*** fp id = %d", m_fragment_prog.Id); LOG_WARNING(RSX, "*** fp id = %d", m_fragment_prog.Id);*/
D3D12_GRAPHICS_PIPELINE_STATE_DESC graphicPipelineStateDesc = {}; D3D12_GRAPHICS_PIPELINE_STATE_DESC graphicPipelineStateDesc = {};
@ -205,6 +205,17 @@ ID3D12PipelineState *PipelineStateObjectCache::getGraphicPipelineState(ID3D12Dev
graphicPipelineStateDesc.BlendState = CD3D12_BLEND_DESC; graphicPipelineStateDesc.BlendState = CD3D12_BLEND_DESC;
graphicPipelineStateDesc.DepthStencilState = CD3D12_DEPTH_STENCIL_DESC; graphicPipelineStateDesc.DepthStencilState = CD3D12_DEPTH_STENCIL_DESC;
graphicPipelineStateDesc.RasterizerState = CD3D12_RASTERIZER_DESC; graphicPipelineStateDesc.RasterizerState = CD3D12_RASTERIZER_DESC;
graphicPipelineStateDesc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
graphicPipelineStateDesc.NumRenderTargets = 1;
graphicPipelineStateDesc.RTVFormats[0] = DXGI_FORMAT_R8G8B8A8_UNORM;
graphicPipelineStateDesc.DSVFormat = DXGI_FORMAT_D16_UNORM;
// graphicPipelineStateDesc.InputLayout.pInputElementDescs = VTXLayout::getInputAssemblyLayout();
// graphicPipelineStateDesc.InputLayout.NumElements = (UINT)VTXLayout::getInputAssemblySize();
graphicPipelineStateDesc.SampleDesc.Count = 1;
graphicPipelineStateDesc.SampleMask = UINT_MAX;
graphicPipelineStateDesc.NodeMask = 1;
device->CreateGraphicsPipelineState(&graphicPipelineStateDesc, IID_PPV_ARGS(&result)); device->CreateGraphicsPipelineState(&graphicPipelineStateDesc, IID_PPV_ARGS(&result));
Add(result, m_fragment_prog, m_vertex_prog); Add(result, m_fragment_prog, m_vertex_prog);
@ -229,11 +240,15 @@ ID3D12PipelineState *PipelineStateObjectCache::getGraphicPipelineState(ID3D12Dev
void Shader::Compile(SHADER_TYPE st) void Shader::Compile(SHADER_TYPE st)
{ {
static const char VSstring[] = static const char VSstring[] =
"float4 main(float4 pos : POSITION) : SV_POSITION" "#define RS \"RootFlags( ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT)\"\n"
"{" "[RootSignature(RS)]\n"
" return pos;" "float4 main(float4 pos : POSITION) : SV_POSITION\n"
"{\n"
" return pos;\n"
"}"; "}";
static const char FSstring[] = static const char FSstring[] =
"#define RS \"RootFlags( ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT)\"\n"
"[RootSignature(RS)]\n"
"float4 main() : SV_TARGET" "float4 main() : SV_TARGET"
"{" "{"
"return float4(1.0f, 1.0f, 1.0f, 1.0f);" "return float4(1.0f, 1.0f, 1.0f, 1.0f);"