ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d3d12: Support for fragment constant buffer

This commit is contained in:
vlj 2015-05-14 21:21:51 +02:00 committed by Vincent Lejeune
parent 9cb87552b8
commit ee3e5cfe1f
5 changed files with 54 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
View File

@ -105,7 +105,16 @@ D3D12GSRender::D3D12GSRender()
&resDesc, &resDesc,
D3D12_RESOURCE_STATE_GENERIC_READ, D3D12_RESOURCE_STATE_GENERIC_READ,
nullptr, nullptr,
IID_PPV_ARGS(&m_constantsBuffer) IID_PPV_ARGS(&m_constantsVertexBuffer)
));
check(m_device->CreateCommittedResource(
&heapProp,
D3D12_HEAP_FLAG_NONE,
&resDesc,
D3D12_RESOURCE_STATE_GENERIC_READ,
nullptr,
IID_PPV_ARGS(&m_constantsFragmentBuffer)
)); ));
D3D12_DESCRIPTOR_HEAP_DESC descriptorHeapDesc = {}; D3D12_DESCRIPTOR_HEAP_DESC descriptorHeapDesc = {};
@ -139,7 +148,7 @@ D3D12GSRender::D3D12GSRender()
descriptorRange[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV; descriptorRange[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV;
// Constants // Constants
descriptorRange[1].BaseShaderRegister = 1; descriptorRange[1].BaseShaderRegister = 1;
descriptorRange[1].NumDescriptors = 1; descriptorRange[1].NumDescriptors = 2;
descriptorRange[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV; descriptorRange[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV;
D3D12_ROOT_PARAMETER RP[2] = {}; D3D12_ROOT_PARAMETER RP[2] = {};
RP[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; RP[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
@ -176,7 +185,8 @@ D3D12GSRender::~D3D12GSRender()
m_backbufferAsRendertarget[1]->Release(); m_backbufferAsRendertarget[1]->Release();
m_constantsBufferDescriptorsHeap->Release(); m_constantsBufferDescriptorsHeap->Release();
m_scaleOffsetDescriptorHeap->Release(); m_scaleOffsetDescriptorHeap->Release();
m_constantsBuffer->Release(); m_constantsVertexBuffer->Release();
m_constantsFragmentBuffer->Release();
m_scaleOffsetBuffer->Release(); m_scaleOffsetBuffer->Release();
for (unsigned i = 0; i < 32; i++) for (unsigned i = 0; i < 32; i++)
m_vertexBuffer[i]->Release(); m_vertexBuffer[i]->Release();
@ -392,7 +402,7 @@ void D3D12GSRender::setScaleOffset()
void D3D12GSRender::FillVertexShaderConstantsBuffer() void D3D12GSRender::FillVertexShaderConstantsBuffer()
{ {
void *constantsBufferMap; void *constantsBufferMap;
check(m_constantsBuffer->Map(0, nullptr, &constantsBufferMap)); check(m_constantsVertexBuffer->Map(0, nullptr, &constantsBufferMap));
for (const RSXTransformConstant& c : m_transform_constants) for (const RSXTransformConstant& c : m_transform_constants)
{ {
@ -402,12 +412,12 @@ void D3D12GSRender::FillVertexShaderConstantsBuffer()
size_t bufferSizeCandidate = offset + 4 * sizeof(float); size_t bufferSizeCandidate = offset + 4 * sizeof(float);
m_constantsBufferSize = bufferSizeCandidate > m_constantsBufferSize ? bufferSizeCandidate : m_constantsBufferSize; m_constantsBufferSize = bufferSizeCandidate > m_constantsBufferSize ? bufferSizeCandidate : m_constantsBufferSize;
} }
m_constantsBuffer->Unmap(0, nullptr); m_constantsVertexBuffer->Unmap(0, nullptr);
// make it multiple of 256 bytes // make it multiple of 256 bytes
m_constantsBufferSize = (m_constantsBufferSize + 255) & ~255; m_constantsBufferSize = (m_constantsBufferSize + 255) & ~255;
D3D12_CONSTANT_BUFFER_VIEW_DESC constantBufferViewDesc = {}; D3D12_CONSTANT_BUFFER_VIEW_DESC constantBufferViewDesc = {};
constantBufferViewDesc.BufferLocation = m_constantsBuffer->GetGPUVirtualAddress(); constantBufferViewDesc.BufferLocation = m_constantsVertexBuffer->GetGPUVirtualAddress();
constantBufferViewDesc.SizeInBytes = (UINT)m_constantsBufferSize; constantBufferViewDesc.SizeInBytes = (UINT)m_constantsBufferSize;
D3D12_CPU_DESCRIPTOR_HANDLE Handle = m_constantsBufferDescriptorsHeap->GetCPUDescriptorHandleForHeapStart(); D3D12_CPU_DESCRIPTOR_HANDLE Handle = m_constantsBufferDescriptorsHeap->GetCPUDescriptorHandleForHeapStart();
Handle.ptr += m_constantsBufferIndex * m_device->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); Handle.ptr += m_constantsBufferIndex * m_device->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
@ -416,28 +426,25 @@ void D3D12GSRender::FillVertexShaderConstantsBuffer()
void D3D12GSRender::FillPixelShaderConstantsBuffer() void D3D12GSRender::FillPixelShaderConstantsBuffer()
{ {
/* if (!m_cur_fragment_prog) size_t index = 0;
{ void *constantsBufferMap;
LOG_ERROR(RSX, "InitFragmentData: m_cur_shader_prog == NULL"); check(m_constantsFragmentBuffer->Map(0, nullptr, &constantsBufferMap));
return;
}
for (const RSXTransformConstant& c : m_fragment_constants) for (const RSXTransformConstant& c : m_fragment_constants)
{ {
u32 id = c.id - m_cur_fragment_prog->offset; u32 id = c.id - m_cur_fragment_prog->offset;
//LOG_WARNING(RSX,"fc%u[0x%x - 0x%x] = (%f, %f, %f, %f)", id, c.id, m_cur_shader_prog->offset, c.x, c.y, c.z, c.w); float vector[] = { c.x, c.y, c.z, c.w };
memcpy(constantsBufferMap, vector, 4 * sizeof(float));
const std::string name = fmt::Format("fc%u", id); index++;
const int l = m_program.GetLocation(name);
checkForGlError("glGetUniformLocation " + name);
glUniform4f(l, c.x, c.y, c.z, c.w);
checkForGlError("glUniform4f " + name + fmt::Format(" %u [%f %f %f %f]", l, c.x, c.y, c.z, c.w));
} }
m_constantsFragmentBuffer->Unmap(0, nullptr);
//if (m_fragment_constants.GetCount())*/ D3D12_CONSTANT_BUFFER_VIEW_DESC constantBufferViewDesc = {};
// LOG_NOTICE(HLE, ""); constantBufferViewDesc.BufferLocation = m_constantsFragmentBuffer->GetGPUVirtualAddress();
constantBufferViewDesc.SizeInBytes = (UINT) index * 4 * sizeof(float);
D3D12_CPU_DESCRIPTOR_HANDLE Handle = m_constantsBufferDescriptorsHeap->GetCPUDescriptorHandleForHeapStart();
Handle.ptr += m_constantsBufferIndex * m_device->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
m_device->CreateConstantBufferView(&constantBufferViewDesc, Handle);
} }
@ -534,14 +541,16 @@ void D3D12GSRender::ExecCMD()
commandList->SetGraphicsRootDescriptorTable(0, Handle); commandList->SetGraphicsRootDescriptorTable(0, Handle);
m_currentScaleOffsetBufferIndex++; m_currentScaleOffsetBufferIndex++;
size_t currentBufferIndex = m_constantsBufferIndex;
FillVertexShaderConstantsBuffer(); FillVertexShaderConstantsBuffer();
commandList->SetDescriptorHeaps(1, &m_constantsBufferDescriptorsHeap); m_constantsBufferIndex++;
Handle = m_constantsBufferDescriptorsHeap->GetGPUDescriptorHandleForHeapStart(); FillPixelShaderConstantsBuffer();
Handle.ptr += m_constantsBufferIndex * m_device->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
commandList->SetGraphicsRootDescriptorTable(1, Handle);
m_constantsBufferIndex++; m_constantsBufferIndex++;
FillPixelShaderConstantsBuffer(); commandList->SetDescriptorHeaps(1, &m_constantsBufferDescriptorsHeap);
Handle = m_constantsBufferDescriptorsHeap->GetGPUDescriptorHandleForHeapStart();
Handle.ptr += currentBufferIndex * m_device->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
commandList->SetGraphicsRootDescriptorTable(1, Handle);
} }
if (!LoadProgram()) if (!LoadProgram())

2
rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
View File

@ -54,7 +54,7 @@ private:
// GLTexture m_gl_vertex_textures[m_textures_count]; // GLTexture m_gl_vertex_textures[m_textures_count];
ID3D12Resource *m_indexBuffer, *m_vertexBuffer[m_vertex_count]; ID3D12Resource *m_indexBuffer, *m_vertexBuffer[m_vertex_count];
ID3D12Resource *m_constantsBuffer; ID3D12Resource *m_constantsVertexBuffer, *m_constantsFragmentBuffer;
ID3D12DescriptorHeap *m_constantsBufferDescriptorsHeap; ID3D12DescriptorHeap *m_constantsBufferDescriptorsHeap;
size_t m_constantsBufferSize, m_constantsBufferIndex; size_t m_constantsBufferSize, m_constantsBufferIndex;

6
rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp
View File

@ -168,9 +168,9 @@ ID3D12PipelineState *PipelineStateObjectCache::getGraphicPipelineState(
} }
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 = {};

13
rpcs3/Emu/RSX/D3D12/FragmentProgramDecompiler.cpp
View File

@ -367,6 +367,7 @@ std::string FragmentDecompiler::BuildCode()
std::stringstream OS; std::stringstream OS;
insertHeader(OS); insertHeader(OS);
insertConstants(OS);
insertIntputs(OS); insertIntputs(OS);
insertMainStart(OS); insertMainStart(OS);
OS << main << std::endl; OS << main << std::endl;
@ -397,6 +398,18 @@ void FragmentDecompiler::insertIntputs(std::stringstream & OS)
OS << "};" << std::endl; OS << "};" << std::endl;
} }
void FragmentDecompiler::insertConstants(std::stringstream & OS)
{
OS << "cbuffer CONSTANT : register(b2)" << std::endl;
OS << "{" << std::endl;
for (ParamType PT : m_parr.params[PARAM_UNIFORM])
{
for (ParamItem PI : PT.items)
OS << " " << PT.type << " " << PI.name << ";" << std::endl;
}
OS << "};" << std::endl;
}
void FragmentDecompiler::insertMainStart(std::stringstream & OS) void FragmentDecompiler::insertMainStart(std::stringstream & OS)
{ {
OS << "float4 main(PSInput In) : SV_TARGET" << std::endl; OS << "float4 main(PSInput In) : SV_TARGET" << std::endl;

1
rpcs3/Emu/RSX/D3D12/FragmentProgramDecompiler.h
View File

@ -39,6 +39,7 @@ class FragmentDecompiler
protected: protected:
virtual void insertHeader(std::stringstream &OS); virtual void insertHeader(std::stringstream &OS);
virtual void insertIntputs(std::stringstream &OS); virtual void insertIntputs(std::stringstream &OS);
virtual void insertConstants(std::stringstream &OS);
virtual void insertMainStart(std::stringstream &OS); virtual void insertMainStart(std::stringstream &OS);
virtual void insertMainEnd(std::stringstream &OS); virtual void insertMainEnd(std::stringstream &OS);
public: public: