Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

obs/gs/effect: Revert #836 #880

Merged
merged 1 commit into from
Aug 19, 2022
Merged

obs/gs/effect: Revert #836 #880

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions source/obs/gs/gs-effect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@

static std::string load_file_as_code(const std::filesystem::path& shader_file, bool is_top_level = true)
{
std::stringstream shader_stream;
const std::filesystem::path& shader_path = std::filesystem::absolute(shader_file);
const std::filesystem::path& shader_root = std::filesystem::path(shader_path).remove_filename();
std::stringstream shader_stream;
const std::filesystem::path shader_path = std::filesystem::absolute(shader_file.native());
const std::filesystem::path shader_root = std::filesystem::path(shader_path.native()).remove_filename();

// Ensure it meets size limits.
uintmax_t size = std::filesystem::file_size(shader_path);
Expand Down