Archived
1
Fork 0

Merge remote-tracking branch 'origin/master'

This commit is contained in:
redstrate 2021-05-12 10:53:42 -04:00
commit 33636d78e1

View file

@ -654,10 +654,10 @@ GFXPipeline* GFXMetal::create_compute_pipeline(const GFXComputePipelineCreateInf
id<MTLLibrary> computeLibrary; id<MTLLibrary> computeLibrary;
{ {
std::string compute_src; std::string compute_src;
if(info.shaders.compute_path.empty()) { if(info.compute_src.is_string()) {
compute_src = info.shaders.compute_src.as_string(); compute_src = info.compute_src.as_string();
} else { } else {
const auto compute_path = info.shaders.compute_path; const auto compute_path = info.compute_src.as_path().string();
auto file = file::open(file::internal_domain / compute_path); auto file = file::open(file::internal_domain / compute_path);
if(file != std::nullopt) { if(file != std::nullopt) {