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

d3d12: Read constants directly from fp

This commit is contained in:
vlj 2015-05-16 19:10:38 +02:00 committed by Vincent Lejeune
parent 7b6ad026c6
commit c3e162b442
4 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -431,15 +431,24 @@ void D3D12GSRender::FillVertexShaderConstantsBuffer()
void D3D12GSRender::FillPixelShaderConstantsBuffer()
{
// Get constant from fragment program
const std::vector<size_t> &fragmentOffset = m_cachePSO.getFragmentConstantOffsetsCache(m_cur_fragment_prog);
size_t offset = 0;
void *constantsBufferMap;
check(m_constantsFragmentBuffer->Map(0, nullptr, &constantsBufferMap));
for (const RSXTransformConstant& c : m_fragment_constants)
for (size_t offsetInFP : fragmentOffset)
{
u32 id = c.id - m_cur_fragment_prog->offset;
float vector[] = { c.x, c.y, c.z, c.w };
memcpy((char*)constantsBufferMap + constantsFragmentSize + offset, vector, 4 * sizeof(float));
offset += 4 * sizeof(float);
auto data = vm::ptr<u32>::make(m_cur_fragment_prog->addr + (u32)offsetInFP);
u32 c0 = (data[0] >> 16 | data[0] << 16);
u32 c1 = (data[1] >> 16 | data[1] << 16);
u32 c2 = (data[2] >> 16 | data[2] << 16);
u32 c3 = (data[3] >> 16 | data[3] << 16);
u32 vector[] = { c0, c1, c2, c3 };
memcpy((char*)constantsBufferMap + constantsFragmentSize + offset, vector, 4 * sizeof(u32));
offset += 4 * sizeof(u32);
}
m_constantsFragmentBuffer->Unmap(0, nullptr);
// Multiple of 256
@ -540,7 +549,16 @@ void D3D12GSRender::ExecCMD()
assert((m_draw_array_first + m_draw_array_count) * item_size <= m_vertexBufferSize[i]);
}
commandList->IASetVertexBuffers(0, (UINT)vertexBufferViews.size(), vertexBufferViews.data());
}
if (!LoadProgram())
{
LOG_ERROR(RSX, "LoadProgram failed.");
Emu.Pause();
return;
}
// Constants
setScaleOffset();
commandList->SetDescriptorHeaps(1, &m_scaleOffsetDescriptorHeap);
D3D12_GPU_DESCRIPTOR_HANDLE Handle = m_scaleOffsetDescriptorHeap->GetGPUDescriptorHandleForHeapStart();
@ -558,14 +576,6 @@ void D3D12GSRender::ExecCMD()
Handle = m_constantsBufferDescriptorsHeap->GetGPUDescriptorHandleForHeapStart();
Handle.ptr += currentBufferIndex * m_device->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
commandList->SetGraphicsRootDescriptorTable(1, Handle);
}
if (!LoadProgram())
{
LOG_ERROR(RSX, "LoadProgram failed.");
Emu.Pause();
return;
}
commandList->SetPipelineState(m_PSO);
InitDrawBuffers();

9
rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
View File

@ -65,6 +65,15 @@ struct D3D12Traits
const std::string &shader = FS.Decompile();
fragmentProgramData.Compile(shader, Shader::SHADER_TYPE::SHADER_TYPE_FRAGMENT);
for (const ParamType& PT : FS.m_parr.params[PF_PARAM_UNIFORM])
{
for (const ParamItem PI : PT.items)
{
size_t offset = atoi(PI.name.c_str() + 2);
fragmentProgramData.FragmentConstantOffsetCache.push_back(offset);
}
}
// TODO: This shouldn't use current dir
fs::file("./FragmentProgram.hlsl", o_write | o_create | o_trunc).write(shader.c_str(), shader.size());
fragmentProgramData.Id = (u32)ID;

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

@ -368,16 +368,14 @@ std::string FragmentDecompiler::BuildCode()
std::stringstream OS;
insertHeader(OS);
OS << std::endl;
insertConstants(OS);
OS << std::endl;
insertIntputs(OS);
OS << std::endl;
insertOutputs(OS);
OS << std::endl;
insertMainStart(OS);
insertConstants(OS);
OS << main << std::endl;
insertMainEnd(OS);
return OS.str();
@ -434,20 +432,20 @@ void FragmentDecompiler::insertOutputs(std::stringstream & OS)
void FragmentDecompiler::insertConstants(std::stringstream & OS)
{
// TODO : Avoid constant recompilation and properly use constant buffer
/* OS << "cbuffer CONSTANT : register(b2)" << std::endl;
OS << "cbuffer CONSTANT : register(b2)" << std::endl;
OS << "{" << std::endl;
for (ParamType PT : m_parr.params[PARAM_UNIFORM])
for (ParamType PT : m_parr.params[PF_PARAM_UNIFORM])
{
for (ParamItem PI : PT.items)
OS << " " << PT.type << " " << PI.name << ";" << std::endl;
}
OS << "};" << std::endl;*/
OS << "};" << std::endl;
for (ParamType PT : m_parr.params[PF_PARAM_UNIFORM])
/* for (ParamType PT : m_parr.params[PF_PARAM_UNIFORM])
{
for (ParamItem PI : PT.items)
OS << PT.type << " " << PI.name << " = " << PI.value << ";" << std::endl;
}
}*/
}
void FragmentDecompiler::insertMainStart(std::stringstream & OS)

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

@ -7,7 +7,6 @@
class FragmentDecompiler
{
std::string main;
ParamArray m_parr;
u32 m_addr;
u32& m_size;
u32 m_const_index;
@ -44,6 +43,7 @@ protected:
virtual void insertMainStart(std::stringstream &OS);
virtual void insertMainEnd(std::stringstream &OS);
public:
ParamArray m_parr;
FragmentDecompiler(u32 addr, u32& size, u32 ctrl);
std::string Decompile();
};