From 07638908c6aed13e37b64e5d7b52d099db200cc9 Mon Sep 17 00:00:00 2001
From: Asuka <6732524+Inori@users.noreply.github.com>
Date: Sun, 7 Aug 2022 02:45:31 +0800
Subject: [PATCH] ignore
---
GPCS4/GPCS4.vcxproj | 12 ------------
GPCS4/GPCS4.vcxproj.filters | 9 ---------
GPCS4/Graphics/Gcn/GcnCompiler.h | 2 +-
GPCS4/Graphics/Gnm/GnmCommandBuffer.cpp | 5 +++++
GPCS4/Graphics/Gnm/GnmCommandBufferDraw.cpp | 9 +++++++--
GPCS4/Graphics/Violet/VltContext.cpp | 1 -
6 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/GPCS4/GPCS4.vcxproj b/GPCS4/GPCS4.vcxproj
index c130ea49..9310d362 100644
--- a/GPCS4/GPCS4.vcxproj
+++ b/GPCS4/GPCS4.vcxproj
@@ -51,10 +51,6 @@
-
- true
- true
-
@@ -339,14 +335,6 @@
-
- true
- true
-
-
- true
- true
-
diff --git a/GPCS4/GPCS4.vcxproj.filters b/GPCS4/GPCS4.vcxproj.filters
index 008ccf85..e9d12d43 100644
--- a/GPCS4/GPCS4.vcxproj.filters
+++ b/GPCS4/GPCS4.vcxproj.filters
@@ -958,9 +958,6 @@
Source Files\Graphics\Gcn\ControlFlowGraph
-
- Source Files\Graphics\Gnm
-
Source Files\Graphics\Gnm
@@ -1710,12 +1707,6 @@
Source Files\Graphics\Gcn\ControlFlowGraph
-
- Source Files\Graphics\Gnm
-
-
- Source Files\Graphics\Gnm
-
Source Files\Graphics\Gnm
diff --git a/GPCS4/Graphics/Gcn/GcnCompiler.h b/GPCS4/Graphics/Gcn/GcnCompiler.h
index 9bebb227..f32021ad 100644
--- a/GPCS4/Graphics/Gcn/GcnCompiler.h
+++ b/GPCS4/Graphics/Gcn/GcnCompiler.h
@@ -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));
diff --git a/GPCS4/Graphics/Gnm/GnmCommandBuffer.cpp b/GPCS4/Graphics/Gnm/GnmCommandBuffer.cpp
index 569df1aa..d82d4456 100644
--- a/GPCS4/Graphics/Gnm/GnmCommandBuffer.cpp
+++ b/GPCS4/Graphics/Gnm/GnmCommandBuffer.cpp
@@ -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;
diff --git a/GPCS4/Graphics/Gnm/GnmCommandBufferDraw.cpp b/GPCS4/Graphics/Gnm/GnmCommandBufferDraw.cpp
index 5b0d5387..5d66432c 100644
--- a/GPCS4/Graphics/Gnm/GnmCommandBufferDraw.cpp
+++ b/GPCS4/Graphics/Gnm/GnmCommandBufferDraw.cpp
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
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,
diff --git a/GPCS4/Graphics/Violet/VltContext.cpp b/GPCS4/Graphics/Violet/VltContext.cpp
index c1f85954..a0331798 100644
--- a/GPCS4/Graphics/Violet/VltContext.cpp
+++ b/GPCS4/Graphics/Violet/VltContext.cpp
@@ -2616,5 +2616,4 @@ namespace sce::vlt
}
-
} // namespace sce::vlt
\ No newline at end of file