etc
/
obs-StreamFX
mirror of https://github.com/Xaymar/obs-StreamFX
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gfx-shader: Fix startup and select crash if file is missing

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2019-12-24 08:37:37 +01:00
parent a3b1fc0b2e
commit 9696f836e0
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/gfx/shader/gfx-shader.cpp
View File

@ -46,11 +46,14 @@ gfx::shader::shader::shader(obs_source_t* self, shader_mode mode)
gfx::shader::shader::~shader() {}
bool gfx::shader::shader::is_shader_different(const std::filesystem::path& file)
{
try {
if (std::filesystem::exists(file)) {
// Check if the file name differs.
if (file != _shader_file)
return true;
}
if (std::filesystem::exists(_shader_file)) {
// Is the file write time different?
if (std::filesystem::last_write_time(_shader_file) != _shader_file_mt)
return true;
@ -58,7 +61,10 @@ bool gfx::shader::shader::is_shader_different(const std::filesystem::path& file)
// Is the file size different?
if (std::filesystem::file_size(_shader_file) != _shader_file_sz)
return true;
}
return false;
} catch (const std::exception&) {
return false;
}
@ -74,19 +80,22 @@ bool gfx::shader::shader::is_technique_different(const std::string& tech)
bool gfx::shader::shader::load_shader(const std::filesystem::path& file, const std::string& tech, bool& shader_dirty,
bool& param_dirty)
{
if (!std::filesystem::exists(file))
return false;
shader_dirty = is_shader_different(file);
param_dirty = is_technique_different(tech) || shader_dirty;
if (shader_dirty) {
try {
_shader = gs::effect(file);
} catch (...) {
return false;
}
_shader_file = file;
_shader_file_mt = std::filesystem::last_write_time(file);
_shader_file_sz = std::filesystem::file_size(file);
_shader_file_tick = 0;
} catch (...) {
return false;
}
}
if (param_dirty) {
auto settings =