Emulation/GPCS4
1
0
Fork 0
mirror of https://github.com/Inori/GPCS4.git synced 2024-05-20 05:00:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

ignore

Browse source
This commit is contained in:
Asuka 2022-08-07 02:45:31 +08:00
parent ab7f91248c
commit 07638908c6
6 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
GPCS4/GPCS4.vcxproj
View file

@ -51,10 +51,6 @@
<ClInclude Include="Graphics\Gcn\GcnShaderRegister.h" />
<ClInclude Include="Graphics\Gcn\GcnStateRegister.h" />
<ClInclude Include="Graphics\Gcn\GcnUtil.h" />
<ClInclude Include="Graphics\Gnm\GnmCommandProxy.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="Graphics\Gnm\GnmGpuLabel.h" />
<ClInclude Include="Graphics\Gnm\GnmInitializer.h" />
<ClInclude Include="Graphics\Gnm\GnmLabelManager.h" />
@ -339,14 +335,6 @@
<ClCompile Include="Graphics\Gcn\GcnModule.cpp" />
<ClCompile Include="Graphics\Gcn\GcnProgramInfo.cpp" />
<ClCompile Include="Graphics\Gcn\GcnStateRegister.cpp" />
<ClCompile Include="Graphics\Gnm\GnmCommandProxy.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="Graphics\Gnm\GnmCommandProxyTable.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="Graphics\Gnm\GnmGpuLabel.cpp" />
<ClCompile Include="Graphics\Gnm\GnmInitializer.cpp" />
<ClCompile Include="Graphics\Gnm\GnmLabelManager.cpp" />

9
GPCS4/GPCS4.vcxproj.filters
View file

@ -958,9 +958,6 @@
<ClInclude Include="Graphics\Gcn\ControlFlowGraph\GcnDivergentFlow.h">
<Filter>Source Files\Graphics\Gcn\ControlFlowGraph</Filter>
</ClInclude>
<ClInclude Include="Graphics\Gnm\GnmCommandProxy.h">
<Filter>Source Files\Graphics\Gnm</Filter>
</ClInclude>
<ClInclude Include="Graphics\Gnm\GnmShader.h">
<Filter>Source Files\Graphics\Gnm</Filter>
</ClInclude>
@ -1710,12 +1707,6 @@
<ClCompile Include="Graphics\Gcn\ControlFlowGraph\GcnDivergentFlow.cpp">
<Filter>Source Files\Graphics\Gcn\ControlFlowGraph</Filter>
</ClCompile>
<ClCompile Include="Graphics\Gnm\GnmCommandProxy.cpp">
<Filter>Source Files\Graphics\Gnm</Filter>
</ClCompile>
<ClCompile Include="Graphics\Gnm\GnmCommandProxyTable.cpp">
<Filter>Source Files\Graphics\Gnm</Filter>
</ClCompile>
<ClCompile Include="Graphics\Gnm\GnmShader.cpp">
<Filter>Source Files\Graphics\Gnm</Filter>
</ClCompile>

2
GPCS4/Graphics/Gcn/GcnCompiler.h
View file

@ -635,7 +635,7 @@ namespace sce::gcn
// To conditionally print something,
// copy and edit the following code:
//
// if (m_header->key().name() == "SHDR_AF20AC1F702451D8" && m_programCounter == 0x70)
//if (m_header->key().name() == "SHDR_AF20AC1F702451D8" && m_programCounter == 0x70)
//{
// auto invId = emitCommonSystemValueLoad(GcnSystemValue::SubgroupInvocationID, 0);
// auto condition = m_module.opIEqual(m_module.defBoolType(), invId.id, m_module.constu32(1));

5
GPCS4/Graphics/Gnm/GnmCommandBuffer.cpp
View file

@ -391,6 +391,11 @@ namespace sce::Gnm
SceTexture GnmCommandBuffer::getResourceTexture(
const GnmImageCreateInfo& info)
{
// TODO:
// we need to map texture memory to vulkan image
// and map different resource descriptor (texture, render target, depth render target)
// to specific image views.
SceTexture result = {};
const auto& tsharp = info.tsharp;

9
GPCS4/Graphics/Gnm/GnmCommandBufferDraw.cpp
View file

@ -25,6 +25,7 @@
#include <array>
#include <fstream>
#include <functional>
#include <thread>
LOG_CHANNEL(Graphic.Gnm.GnmCommandBufferDraw);
@ -943,6 +944,11 @@ namespace sce::Gnm
auto shader = getShader(ctx.code);
auto& resTable = shader.getResources();
//if (shader.name().find("5EBFDA0415B9C404") != std::string::npos)
//{
// __debugbreak();
//}
if constexpr (Indexed)
{
bindIndexBuffer();
@ -985,12 +991,11 @@ namespace sce::Gnm
++count;
if (count == 2)
{
RdcController::instance()->triggerCapture();
//RdcController::instance()->triggerCapture();
}
//__debugbreak();
}
// create and bind shader resources
bindResource(VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
resTable,

1
GPCS4/Graphics/Violet/VltContext.cpp
View file

@ -2616,5 +2616,4 @@ namespace sce::vlt
}
} // namespace sce::vlt