mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Limit shaderlog writing behind log_programs setting

Browse Source
This commit is contained in:
msuih 2019-05-31 17:41:33 +03:00 committed by Ivan
parent f2cac26154
commit ef587d4cdc
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,8 +129,8 @@ struct D3D12Traits
fragmentProgramData.FragmentConstantOffsetCache.push_back(offset); fragmentProgramData.FragmentConstantOffsetCache.push_back(offset);
} }
} }
if (g_cfg.video.log_programs)
fs::file(fs::get_cache_dir() + "shaderlog/FragmentProgram" + std::to_string(ID) + ".hlsl", fs::rewrite).write(shader); fs::file(fs::get_cache_dir() + "shaderlog/FragmentProgram" + std::to_string(ID) + ".hlsl", fs::rewrite).write(shader);
fragmentProgramData.id = (u32)ID; fragmentProgramData.id = (u32)ID;
} }
@ -141,7 +141,8 @@ struct D3D12Traits
std::string shaderCode = VS.Decompile(); std::string shaderCode = VS.Decompile();
vertexProgramData.Compile(shaderCode, Shader::SHADER_TYPE::SHADER_TYPE_VERTEX); vertexProgramData.Compile(shaderCode, Shader::SHADER_TYPE::SHADER_TYPE_VERTEX);
vertexProgramData.vertex_shader_input_count = RSXVP.rsx_vertex_inputs.size(); vertexProgramData.vertex_shader_input_count = RSXVP.rsx_vertex_inputs.size();
fs::file(fs::get_cache_dir() + "shaderlog/VertexProgram" + std::to_string(ID) + ".hlsl", fs::rewrite).write(shaderCode); if (g_cfg.video.log_programs)
fs::file(fs::get_cache_dir() + "shaderlog/VertexProgram" + std::to_string(ID) + ".hlsl", fs::rewrite).write(shaderCode);
vertexProgramData.id = (u32)ID; vertexProgramData.id = (u32)ID;
} }

3
rpcs3/Emu/RSX/GL/GLHelpers.h
View File

@ -12,6 +12,7 @@
#include "../GCM.h" #include "../GCM.h"
#include "../Common/TextureUtils.h" #include "../Common/TextureUtils.h"
#include "Emu/System.h"
#include "Utilities/geometry.h" #include "Utilities/geometry.h"
#define GL_FRAGMENT_TEXTURES_START 0 #define GL_FRAGMENT_TEXTURES_START 0
@ -2421,7 +2422,7 @@ public:
{ {
const char* str = src.c_str(); const char* str = src.c_str();
const GLint length = (GLint)src.length(); const GLint length = (GLint)src.length();
if (g_cfg.video.log_programs)
{ {
std::string base_name; std::string base_name;
switch (shader_type) switch (shader_type)

3
rpcs3/Emu/RSX/GL/GLVertexProgram.cpp
View File

@ -358,7 +358,8 @@ void GLVertexProgram::Compile()
const char* str = shader.c_str(); const char* str = shader.c_str();
const int strlen = ::narrow<int>(shader.length()); const int strlen = ::narrow<int>(shader.length());
fs::file(fs::get_cache_dir() + "shaderlog/VertexProgram" + std::to_string(id) + ".glsl", fs::rewrite).write(str); if (g_cfg.video.log_programs)
fs::file(fs::get_cache_dir() + "shaderlog/VertexProgram" + std::to_string(id) + ".glsl", fs::rewrite).write(str);
glShaderSource(id, 1, &str, &strlen); glShaderSource(id, 1, &str, &strlen);
glCompileShader(id); glCompileShader(id);

3
rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp
View File

@ -455,7 +455,8 @@ void VKFragmentProgram::Decompile(const RSXFragmentProgram& prog)
void VKFragmentProgram::Compile() void VKFragmentProgram::Compile()
{ {
fs::file(fs::get_cache_dir() + "shaderlog/FragmentProgram" + std::to_string(id) + ".spirv", fs::rewrite).write(shader.get_source()); if (g_cfg.video.log_programs)
fs::file(fs::get_cache_dir() + "shaderlog/FragmentProgram" + std::to_string(id) + ".spirv", fs::rewrite).write(shader.get_source());
handle = shader.compile(); handle = shader.compile();
} }

3
rpcs3/Emu/RSX/VK/VKVertexProgram.cpp
View File

@ -365,7 +365,8 @@ void VKVertexProgram::Decompile(const RSXVertexProgram& prog)
void VKVertexProgram::Compile() void VKVertexProgram::Compile()
{ {
fs::file(fs::get_cache_dir() + "shaderlog/VertexProgram" + std::to_string(id) + ".spirv", fs::rewrite).write(shader.get_source()); if (g_cfg.video.log_programs)
fs::file(fs::get_cache_dir() + "shaderlog/VertexProgram" + std::to_string(id) + ".spirv", fs::rewrite).write(shader.get_source());
handle = shader.compile(); handle = shader.compile();
} }