mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-19 18:13:21 +02:00
make result not optional
This fixes crash when hardware shader is enabled in the flatpak version
This commit is contained in:
parent
bf03fb83ae
commit
03c002ee2a
@ -254,7 +254,7 @@ public:
|
|||||||
explicit ShaderDoubleCache(bool separable) : separable(separable) {}
|
explicit ShaderDoubleCache(bool separable) : separable(separable) {}
|
||||||
std::tuple<GLuint, std::optional<ShaderDecompiler::ProgramResult>> Get(
|
std::tuple<GLuint, std::optional<ShaderDecompiler::ProgramResult>> Get(
|
||||||
const KeyConfigType& key, const Pica::Shader::ShaderSetup& setup) {
|
const KeyConfigType& key, const Pica::Shader::ShaderSetup& setup) {
|
||||||
std::optional<ShaderDecompiler::ProgramResult> result{};
|
ShaderDecompiler::ProgramResult result{};
|
||||||
auto map_it = shader_map.find(key);
|
auto map_it = shader_map.find(key);
|
||||||
if (map_it == shader_map.end()) {
|
if (map_it == shader_map.end()) {
|
||||||
auto program_opt = CodeGenerator(setup, key, separable);
|
auto program_opt = CodeGenerator(setup, key, separable);
|
||||||
@ -267,7 +267,7 @@ public:
|
|||||||
auto [iter, new_shader] = shader_cache.emplace(program, OGLShaderStage{separable});
|
auto [iter, new_shader] = shader_cache.emplace(program, OGLShaderStage{separable});
|
||||||
OGLShaderStage& cached_shader = iter->second;
|
OGLShaderStage& cached_shader = iter->second;
|
||||||
if (new_shader) {
|
if (new_shader) {
|
||||||
result->code = program;
|
result.code = program;
|
||||||
cached_shader.Create(program.c_str(), ShaderType);
|
cached_shader.Create(program.c_str(), ShaderType);
|
||||||
}
|
}
|
||||||
shader_map[key] = &cached_shader;
|
shader_map[key] = &cached_shader;
|
||||||
|
Loading…
Reference in New Issue
Block a user