layer: Fixed options settings for generated layers, fixed typos

Handling of non-zero default values now also fixed.

5 files changed, 11 insertions, 14 deletions

diff --git a/layers/draw_state.c b/layers/draw_state.c
index 39745d15..698e4a94 100644
--- a/layers/draw_state.c
+++ b/layers/draw_state.c
@@ -1594,8 +1594,8 @@ static void initDrawState(void)
 {
     const char *strOpt;
     // initialize DrawState options
-    g_reportingLevel = (XGL_LAYER_DBG_REPORT_LEVEL)getLayerOptionEnum("MemTrackerReportLevel");
-    g_debugAction = (XGL_LAYER_DBG_ACTION)getLayerOptionEnum("MemTrackerDebugAction");
+    g_reportingLevel = getLayerOptionEnum("DrawStateReportLevel", g_reportingLevel);
+    g_debugAction    = getLayerOptionEnum("DrawStateDebugAction", g_debugAction);
 
     if (g_debugAction & XGL_DBG_LAYER_ACTION_LOG_MSG)
     {
diff --git a/layers/layers_config.cpp b/layers/layers_config.cpp
index bcde6d28..14e8053d 100644
--- a/layers/layers_config.cpp
+++ b/layers/layers_config.cpp
@@ -81,12 +81,14 @@ const char *getLayerOption(const char *_option)
     return g_configFileObj.getOption(_option);
 }
 
-uint32_t getLayerOptionEnum(const char *_option)
+uint32_t getLayerOptionEnum(const char *_option, uint32_t optionDefault)
 {
     uint32_t val = 0;
     const char *option = (g_configFileObj.getOption(_option));
     if (option != NULL) {
-       val = convertStringEnumVal(option);
+        val = convertStringEnumVal(option);
+    } else {
+        val = optionDefault;
     }
     return val;
 }
diff --git a/layers/layers_config.h b/layers/layers_config.h
index 83eeecb5..722f40d3 100644
--- a/layers/layers_config.h
+++ b/layers/layers_config.h
@@ -29,7 +29,7 @@ extern "C" {
 #endif
 
 const char *getLayerOption(const char *_option);
-uint32_t getLayerOptionEnum(const char *_option);
+uint32_t getLayerOptionEnum(const char *_option, uint32_t optionDefault);
 
 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 aaf30df7..df2cdd73 100644
--- a/layers/mem_tracker.c
+++ b/layers/mem_tracker.c
@@ -733,8 +733,8 @@ static void initMemTracker(void)
 {
     const char *strOpt;
     // initialize MemTracker options
-    g_reportingLevel = (XGL_LAYER_DBG_REPORT_LEVEL)getLayerOptionEnum("MemTrackerReportLevel");
-    g_debugAction = (XGL_LAYER_DBG_ACTION)getLayerOptionEnum("MemTrackerDebugAction");
+    g_reportingLevel = getLayerOptionEnum("MemTrackerReportLevel", g_reportingLevel);
+    g_debugAction    = getLayerOptionEnum("MemTrackerDebugAction", g_debugAction);
 
     if (g_debugAction & XGL_DBG_LAYER_ACTION_LOG_MSG)
     {
diff --git a/xgl-layer-generate.py b/xgl-layer-generate.py
index b064e5f4..2c03efa4 100755
--- a/xgl-layer-generate.py
+++ b/xgl-layer-generate.py
@@ -888,13 +888,8 @@ class Subcommand(object):
         if init_opts:
             func_body.append('    const char *strOpt;')
             func_body.append('    // initialize %s options' % name)
-            func_body.append('    strOpt = getLayerOption("%sReportLevel");' % name)
-            func_body.append('    if (strOpt != NULL)')
-            func_body.append('        g_reportingLevel = atoi(strOpt);')
-            func_body.append('')
-            func_body.append('    strOpt = getLayerOption("%sDebugAction");' % name)
-            func_body.append('    if (strOpt != NULL)')
-            func_body.append('        g_debugAction = atoi(strOpt);')
+            func_body.append('    g_reportingLevel = getLayerOptionEnum("%sReportLevel", g_reportingLevel);' % name)
+            func_body.append('    g_debugAction    = getLayerOptionEnum("%sDebugAction", g_debugAction);' % name)
             func_body.append('')
             func_body.append('    if (g_debugAction & XGL_DBG_LAYER_ACTION_LOG_MSG)')
             func_body.append('    {')