diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-03-03 15:07:15 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-03-03 16:14:23 -0700 |
| commit | fec2742ee52289b16b9c52d8fcf268bbfeca8b1a (patch) | |
| tree | 52001da8cf2de82fa52358527dc4c1ac41040e1b /layers/layers_config.cpp | |
| parent | c7e14a666730a3b5f66134ab18c1409aa418bc0b (diff) | |
| download | usermoji-fec2742ee52289b16b9c52d8fcf268bbfeca8b1a.tar.xz | |
layers: if no settings file or call overrides make callback override loging
Default debugAction in layers is to log based on variable init. Make the
overrides work as follows:
1) app calls xglRegisterMsgCallback()
2) settings file
3) Glave (or app) calls to setlayerOption()
Diffstat (limited to 'layers/layers_config.cpp')
| -rw-r--r-- | layers/layers_config.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/layers/layers_config.cpp b/layers/layers_config.cpp index 14e8053d..6992f06f 100644 --- a/layers/layers_config.cpp +++ b/layers/layers_config.cpp @@ -81,16 +81,17 @@ const char *getLayerOption(const char *_option) return g_configFileObj.getOption(_option); } -uint32_t getLayerOptionEnum(const char *_option, uint32_t optionDefault) +bool getLayerOptionEnum(const char *_option, uint32_t *optionDefault) { - uint32_t val = 0; + bool res; const char *option = (g_configFileObj.getOption(_option)); if (option != NULL) { - val = convertStringEnumVal(option); + *optionDefault = convertStringEnumVal(option); + res = false; } else { - val = optionDefault; + res = true; } - return val; + return res; } void setLayerOptionEnum(const char *_option, const char *_valEnum) |
