diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2015-02-25 12:23:20 -0600 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2015-02-25 14:00:53 -0600 |
| commit | 3cbdb3c51fddb38d241999d92a898c302ad230c3 (patch) | |
| tree | 3ed0aef16de89a8681f2e22d7784490a115e48bc | |
| parent | ecf76b7105c8e3e75514d790aee731a671535d2c (diff) | |
| download | usermoji-3cbdb3c51fddb38d241999d92a898c302ad230c3.tar.xz | |
layers: Fix layer config file options
Needed to end up with enums here, added this option.
| -rw-r--r-- | layers/draw_state.c | 9 | ||||
| -rw-r--r-- | layers/layers_config.cpp | 10 | ||||
| -rw-r--r-- | layers/layers_config.h | 1 | ||||
| -rw-r--r-- | layers/mem_tracker.c | 9 |
4 files changed, 15 insertions, 14 deletions
diff --git a/layers/draw_state.c b/layers/draw_state.c index 3a415c50..e4c06a7f 100644 --- a/layers/draw_state.c +++ b/layers/draw_state.c @@ -1580,13 +1580,8 @@ static void initDrawState(void) { const char *strOpt; // initialize DrawState options - strOpt = getLayerOption("DrawStateReportLevel"); - if (strOpt != NULL) - g_reportingLevel = atoi(strOpt); - - strOpt = getLayerOption("DrawStateDebugAction"); - if (strOpt != NULL) - g_debugAction = atoi(strOpt); + g_reportingLevel = (XGL_LAYER_DBG_REPORT_LEVEL)getLayerOptionEnum("MemTrackerReportLevel"); + g_debugAction = (XGL_LAYER_DBG_ACTION)getLayerOptionEnum("MemTrackerDebugAction"); if (g_debugAction & XGL_DBG_LAYER_ACTION_LOG_MSG) { diff --git a/layers/layers_config.cpp b/layers/layers_config.cpp index 5528358f..bcde6d28 100644 --- a/layers/layers_config.cpp +++ b/layers/layers_config.cpp @@ -81,6 +81,16 @@ const char *getLayerOption(const char *_option) return g_configFileObj.getOption(_option); } +uint32_t getLayerOptionEnum(const char *_option) +{ + uint32_t val = 0; + const char *option = (g_configFileObj.getOption(_option)); + if (option != NULL) { + val = convertStringEnumVal(option); + } + return val; +} + void setLayerOptionEnum(const char *_option, const char *_valEnum) { unsigned int val = convertStringEnumVal(_valEnum); diff --git a/layers/layers_config.h b/layers/layers_config.h index 0010c098..83eeecb5 100644 --- a/layers/layers_config.h +++ b/layers/layers_config.h @@ -29,6 +29,7 @@ extern "C" { #endif const char *getLayerOption(const char *_option); +uint32_t getLayerOptionEnum(const char *_option); void setLayerOption(const char *_option, const char *_val); void setLayerOptionEnum(const char *_option, const char *_valEnum); diff --git a/layers/mem_tracker.c b/layers/mem_tracker.c index 1d1b894f..44e6e27d 100644 --- a/layers/mem_tracker.c +++ b/layers/mem_tracker.c @@ -727,13 +727,8 @@ static void initMemTracker(void) { const char *strOpt; // initialize MemTracker options - strOpt = getLayerOption("MemTrackerReportLevel"); - if (strOpt != NULL) - g_reportingLevel = atoi(strOpt); - - strOpt = getLayerOption("MemTrackerDebugAction"); - if (strOpt != NULL) - g_debugAction = atoi(strOpt); + g_reportingLevel = (XGL_LAYER_DBG_REPORT_LEVEL)getLayerOptionEnum("MemTrackerReportLevel"); + g_debugAction = (XGL_LAYER_DBG_ACTION)getLayerOptionEnum("MemTrackerDebugAction"); if (g_debugAction & XGL_DBG_LAYER_ACTION_LOG_MSG) { |