Skip to content
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

Jump to bottom

Ability to load shader on launch from command line #2721

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ability to load shader on launch from command line #2721

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions include/mgba/feature/commandline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ struct mArguments {
char* cheatsFile;
char* savestate;
char* bios;
char* shader;
int logLevel;
int frameskip;

Expand Down
12 changes: 11 additions & 1 deletion src/feature/commandline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ static const struct option _options[] = {
{ "log-level", required_argument, 0, 'l' },
{ "savestate", required_argument, 0, 't' },
{ "patch", required_argument, 0, 'p' },
{ "shader", required_argument, 0, 'a'},
{ "version", no_argument, 0, '\0' },
{ 0, 0, 0, 0 }
};
Expand Down Expand Up @@ -71,7 +72,7 @@ static void _tableApply(const char* key, void* value, void* user) {
bool mArgumentsParse(struct mArguments* args, int argc, char* const* argv, struct mSubParser* subparsers, int nSubparsers) {
int ch;
char options[128] =
"b:c:C:hl:p:s:t:"
"b:c:C:hl:p:s:t:a:"
#ifdef USE_EDITLINE
"d"
#endif
Expand Down Expand Up @@ -166,6 +167,9 @@ bool mArgumentsParse(struct mArguments* args, int argc, char* const* argv, struc
case 't':
args->savestate = strdup(optarg);
break;
case 'a':
args->shader = strdup(optarg);
break;
default:
for (i = 0; i < nSubparsers; ++i) {
if (subparsers[i].parse) {
Expand Down Expand Up @@ -201,6 +205,9 @@ void mArgumentsApply(const struct mArguments* args, struct mSubParser* subparser
mCoreConfigSetOverrideValue(config, "bios", args->bios);
mCoreConfigSetOverrideIntValue(config, "useBios", true);
}
if (args->shader) {
mCoreConfigSetOverrideValue(config, "shader", args->shader);
}
HashTableEnumerate(&args->configOverrides, _tableApply, config);
int i;
for (i = 0; i < nSubparsers; ++i) {
Expand All @@ -226,6 +233,9 @@ void mArgumentsDeinit(struct mArguments* args) {
free(args->bios);
args->bios = 0;

free(args->shader);
args->shader = 0;

HashTableDeinit(&args->configOverrides);
}

Expand Down