thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2026-04-28 05:11:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Assign names to shaders during loading.

Browse source
This commit is contained in:
Skyth 2024-11-27 00:29:25 +03:00
parent dc3c5ab7ff
commit 685fe7285d
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
UnleashedRecomp/gpu/video.cpp
View file

@ -36,8 +36,6 @@
#include "shader/resolve_msaa_depth_8x.hlsl.dxil.h" #include "shader/resolve_msaa_depth_8x.hlsl.dxil.h"
#include "shader/resolve_msaa_depth_8x.hlsl.spirv.h" #include "shader/resolve_msaa_depth_8x.hlsl.spirv.h"
//#define ASYNC_PSO_DEBUG
extern "C" extern "C"
{ {
__declspec(dllexport) unsigned long NvOptimusEnablement = 0x00000001; __declspec(dllexport) unsigned long NvOptimusEnablement = 0x00000001;
@ -2737,7 +2735,8 @@ static RenderPipeline* CreateGraphicsPipelineInRenderThread(PipelineState pipeli
#ifdef ASYNC_PSO_DEBUG #ifdef ASYNC_PSO_DEBUG
++g_pipelinesCreatedInRenderThread; ++g_pipelinesCreatedInRenderThread;
pipeline->setName(std::format("Render Thread Pipeline {:X}", hash)); pipeline->setName(std::format("{} {} {:X}",
pipelineState.vertexShader->name, pipelineState.pixelShader != nullptr ? pipelineState.pixelShader->name : "<none>", hash));
#endif #endif
} }
@ -4296,7 +4295,7 @@ static void CreateGraphicsPipelineInPipelineThread(const PipelineState& pipeline
if (shouldCompile) if (shouldCompile)
{ {
auto pipeline = CreateGraphicsPipeline(pipelineState); auto pipeline = CreateGraphicsPipeline(pipelineState);
pipeline->setName(std::format("Async Pipeline {} {:X}", name, hash)); pipeline->setName(std::format("ASYNC {} {:X}", name, hash));
// Will get dropped in render thread if a different thread already managed to compile this. // Will get dropped in render thread if a different thread already managed to compile this.
RenderCommand cmd; RenderCommand cmd;
@ -4721,6 +4720,26 @@ static void ModelConsumerThread()
static std::thread g_modelConsumerThread(ModelConsumerThread); static std::thread g_modelConsumerThread(ModelConsumerThread);
#ifdef ASYNC_PSO_DEBUG
PPC_FUNC_IMPL(__imp__sub_82E33330);
PPC_FUNC(sub_82E33330)
{
auto vertexShaderCode = reinterpret_cast<Hedgehog::Mirage::CVertexShaderCodeData*>(g_memory.Translate(ctx.r4.u32));
__imp__sub_82E33330(ctx, base);
reinterpret_cast<GuestShader*>(vertexShaderCode->m_pD3DVertexShader.get())->name = vertexShaderCode->m_TypeAndName.c_str() + 3;
}
PPC_FUNC_IMPL(__imp__sub_82E328D8);
PPC_FUNC(sub_82E328D8)
{
auto pixelShaderCode = reinterpret_cast<Hedgehog::Mirage::CPixelShaderCodeData*>(g_memory.Translate(ctx.r4.u32));
__imp__sub_82E328D8(ctx, base);
reinterpret_cast<GuestShader*>(pixelShaderCode->m_pD3DPixelShader.get())->name = pixelShaderCode->m_TypeAndName.c_str() + 2;
}
#endif
GUEST_FUNCTION_HOOK(sub_82BD99B0, CreateDevice); GUEST_FUNCTION_HOOK(sub_82BD99B0, CreateDevice);
GUEST_FUNCTION_HOOK(sub_82BE6230, DestructResource); GUEST_FUNCTION_HOOK(sub_82BE6230, DestructResource);

5
UnleashedRecomp/gpu/video.h
View file

@ -1,5 +1,7 @@
#pragma once #pragma once
//#define ASYNC_PSO_DEBUG
#include "rhi/rt64_render_interface.h" #include "rhi/rt64_render_interface.h"
#define D3DCLEAR_TARGET 0x1 #define D3DCLEAR_TARGET 0x1
@ -246,6 +248,9 @@ struct GuestShader : GuestResource
ankerl::unordered_dense::map<uint32_t, std::unique_ptr<RenderShader>> linkedShaders; ankerl::unordered_dense::map<uint32_t, std::unique_ptr<RenderShader>> linkedShaders;
std::vector<ComPtr<IDxcBlob>> shaderBlobs; std::vector<ComPtr<IDxcBlob>> shaderBlobs;
ComPtr<IDxcBlobEncoding> libraryBlob; ComPtr<IDxcBlobEncoding> libraryBlob;
#ifdef ASYNC_PSO_DEBUG
const char* name = "<unknown>";
#endif
}; };
struct GuestViewport struct GuestViewport