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

gs-effect-technique: Return nullptr instead of throwing exception

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2019-12-15 10:37:57 +01:00
parent ef76e353d3
commit 1f25b56579
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/obs/gs/gs-effect-technique.cpp
View File

@ -23,7 +23,8 @@
#include <graphics/effect.h> #include <graphics/effect.h>
gs::effect_technique::effect_technique(gs_technique_t* technique, std::shared_ptr<gs_effect_t>* parent) : _parent(parent) gs::effect_technique::effect_technique(gs_technique_t* technique, std::shared_ptr<gs_effect_t>* parent)
: _parent(parent)
{ {
reset(technique, [](void*) {}); reset(technique, [](void*) {});
} }
@ -32,7 +33,6 @@ gs::effect_technique::~effect_technique() {}
std::string gs::effect_technique::name() std::string gs::effect_technique::name()
{ {
return std::string(get()->name, get()->name + strnlen_s(get()->name, 256)); return std::string(get()->name, get()->name + strnlen_s(get()->name, 256));
} }
@ -44,7 +44,7 @@ size_t gs::effect_technique::count_passes()
gs::effect_pass gs::effect_technique::get_pass(size_t idx) gs::effect_pass gs::effect_technique::get_pass(size_t idx)
{ {
if (idx >= get()->passes.num) { if (idx >= get()->passes.num) {
throw std::out_of_range("Index is out of range."); return nullptr;
} }
return gs::effect_pass(get()->passes.array + idx, this); return gs::effect_pass(get()->passes.array + idx, this);
@ -58,7 +58,7 @@ gs::effect_pass gs::effect_technique::get_pass(std::string name)
return gs::effect_pass(ptr, this); return gs::effect_pass(ptr, this);
} }
throw std::invalid_argument("Pass with given name does not exist."); return nullptr;
} }
bool gs::effect_technique::has_pass(std::string name) bool gs::effect_technique::has_pass(std::string name)