citra/citra-canary
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-canary.git synced 2024-12-24 17:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5248 from lioncash/view

Browse source 
post_processing_opengl: Make use of std::string_view with GetPostProcessingShaderCode()
This commit is contained in:
Sebastian Valle 2020-04-19 21:46:48 -05:00 committed by GitHub
parent 0f72dd6d85 623cc926ed
commit df92b37bbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/video_core/renderer_opengl/post_processing_opengl.cpp
View file

@ -150,7 +150,7 @@ std::vector<std::string> GetPostProcessingShaderList(bool anaglyph) {
return shader_names; return shader_names;
} }
std::string GetPostProcessingShaderCode(bool anaglyph, std::string shader) { std::string GetPostProcessingShaderCode(bool anaglyph, std::string_view shader) {
std::string shader_dir = FileUtil::GetUserPath(FileUtil::UserPath::ShaderDir); std::string shader_dir = FileUtil::GetUserPath(FileUtil::UserPath::ShaderDir);
std::string shader_path; std::string shader_path;

3
src/video_core/renderer_opengl/post_processing_opengl.h
View file

@ -5,6 +5,7 @@
#pragma once #pragma once
#include <string> #include <string>
#include <string_view>
#include <vector> #include <vector>
namespace OpenGL { namespace OpenGL {
@ -18,6 +19,6 @@ std::vector<std::string> GetPostProcessingShaderList(bool anaglyph);
// If anaglyph is true, it searches the shaders/anaglyph directory rather than // If anaglyph is true, it searches the shaders/anaglyph directory rather than
// the shaders directory // the shaders directory
// If the shader cannot be loaded, an empty string is returned // If the shader cannot be loaded, an empty string is returned
std::string GetPostProcessingShaderCode(bool anaglyph, std::string shader_name); std::string GetPostProcessingShaderCode(bool anaglyph, std::string_view shader_name);
} // namespace OpenGL } // namespace OpenGL