From 3cbdb3c51fddb38d241999d92a898c302ad230c3 Mon Sep 17 00:00:00 2001
From: Mark Lobodzinski <mark@lunarg.com>
Date: Wed, 25 Feb 2015 12:23:20 -0600
Subject: [PATCH] layers: Fix layer config file options

Needed to end up with enums here, added this option.
---
 layers/draw_state.c      |  9 ++-------
 layers/layers_config.cpp | 10 ++++++++++
 layers/layers_config.h   |  1 +
 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 3a415c5..e4c06a7 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 5528358..bcde6d2 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 0010c09..83eeecb 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 1d1b894..44e6e27 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)
     {
-- 
2.7.4