Skip to content

Resolve Metal shader sources relative to the executable #575

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
rinaldofesta wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −0
Open

Resolve Metal shader sources relative to the executable #575

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
17 changes: 17 additions & 0 deletions ds4_metal.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#import <Foundation/Foundation.h>
#import <Metal/Metal.h>
#include <mach-o/dyld.h>

#include <stdint.h>
#include <inttypes.h>
Expand Down Expand Up @@ -3066,6 +3067,20 @@ static int ds4_gpu_model_map_log_enabled(void) {
@[@"DS4_METAL_SET_ROWS_SOURCE", @"metal/set_rows.metal"],
];

/* Shader sources resolve against the current directory first, then against
* the directory containing the executable, so the binary can be launched
* from any working directory (e.g. inside another project). */
NSString *exe_dir = nil;
{
char exe_path[4096];
uint32_t exe_len = sizeof(exe_path);
if (_NSGetExecutablePath(exe_path, &exe_len) == 0) {
NSString *resolved = [[NSString stringWithUTF8String:exe_path]
stringByResolvingSymlinksInPath];
exe_dir = [resolved stringByDeletingLastPathComponent];
}
}

NSMutableString *source = [NSMutableString stringWithString:base];
for (NSArray<NSString *> *spec in required_sources) {
const char *override_path = getenv([spec[0] UTF8String]);
Expand All @@ -3075,6 +3090,8 @@ static int ds4_gpu_model_map_log_enabled(void) {
}
[paths addObject:spec[1]];
[paths addObject:[@"./" stringByAppendingString:spec[1]]];
if (exe_dir)
[paths addObject:[exe_dir stringByAppendingPathComponent:spec[1]]];

NSString *loaded = nil;
NSString *loaded_path = nil;
Expand Down