redstrate/prism
Archived
1
Fork 0
Code Activity

Update macOS and Metal backends for the new changes

Browse source
This commit is contained in:
redstrate 2021-05-12 10:59:30 -04:00
parent 33636d78e1
commit b20235a731
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
engine/gfx/metal/src/gfx_metal.mm
View file

@ -454,7 +454,7 @@ GFXPipeline* GFXMetal::create_graphics_pipeline(const GFXGraphicsPipelineCreateI
} else { } else {
const auto vertex_path = info.shaders.vertex_src.as_path().string(); const auto vertex_path = info.shaders.vertex_src.as_path().string();
auto file = file::open(file::internal_domain / vertex_path); auto file = prism::open_file(prism::internal_domain / vertex_path);
if(file != std::nullopt) { if(file != std::nullopt) {
vertex_src = file->read_as_string(); vertex_src = file->read_as_string();
} else { } else {
@ -486,7 +486,7 @@ GFXPipeline* GFXMetal::create_graphics_pipeline(const GFXGraphicsPipelineCreateI
} else { } else {
const auto fragment_path = info.shaders.fragment_src.as_path().string(); const auto fragment_path = info.shaders.fragment_src.as_path().string();
auto file = file::open(file::internal_domain / fragment_path); auto file = prism::open_file(prism::internal_domain / fragment_path);
if(file != std::nullopt) { if(file != std::nullopt) {
fragment_src = file->read_as_string(); fragment_src = file->read_as_string();
} else { } else {
@ -659,7 +659,7 @@ GFXPipeline* GFXMetal::create_compute_pipeline(const GFXComputePipelineCreateInf
} else { } else {
const auto compute_path = info.compute_src.as_path().string(); const auto compute_path = info.compute_src.as_path().string();
auto file = file::open(file::internal_domain / compute_path); auto file = prism::open_file(prism::internal_domain / compute_path);
if(file != std::nullopt) { if(file != std::nullopt) {
compute_src = file->read_as_string(); compute_src = file->read_as_string();
} else { } else {

4
platforms/mac/file.mm
View file

@ -20,7 +20,7 @@ inline std::string clean_path(const std::string_view path) {
return p; return p;
} }
void file::set_domain_path(const Domain domain, const Path path) { void prism::set_domain_path(const prism::domain domain, const prism::path path) {
NSBundle* bundle = [NSBundle mainBundle]; NSBundle* bundle = [NSBundle mainBundle];
NSString* resourceFolderPath = [bundle resourcePath]; NSString* resourceFolderPath = [bundle resourcePath];
@ -34,7 +34,7 @@ void file::set_domain_path(const Domain domain, const Path path) {
domain_data[static_cast<int>(domain)] = clean_path([[[url absoluteURL] absoluteString] cStringUsingEncoding:NSUTF8StringEncoding]); domain_data[static_cast<int>(domain)] = clean_path([[[url absoluteURL] absoluteString] cStringUsingEncoding:NSUTF8StringEncoding]);
} }
file::Path file::get_writeable_directory() { prism::path prism::get_writeable_directory() {
NSArray* paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); NSArray* paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
NSString* resourceFolderPath = paths[0]; NSString* resourceFolderPath = paths[0];

2
tools/common/src/commoneditor.cpp
View file

@ -49,7 +49,7 @@ const std::map<ImGuiKey, InputButton> imToPl = {
CommonEditor::CommonEditor(std::string id) : id(id) { CommonEditor::CommonEditor(std::string id) : id(id) {
#ifdef PLATFORM_MACOS #ifdef PLATFORM_MACOS
file::set_domain_path(file::domain::App, "../../../data"); prism::set_domain_path(prism::domain::app, "../../../data");
#else #else
prism::set_domain_path(prism::domain::app, "data"); prism::set_domain_path(prism::domain::app, "data");
#endif #endif