diff options
| author | Tobin Ehlis <tobin@lunarg.com> | 2015-09-01 11:59:36 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobin@lunarg.com> | 2015-09-03 08:11:48 -0600 |
| commit | 86c7964efdfb005ee55d269412d5410649a2c1a3 (patch) | |
| tree | a1b1d715e1745bcb91f68daeadb43c1d7f760337 | |
| parent | 78bab7912aed79926a95fa12d3f26d74d1c0618b (diff) | |
| download | usermoji-86c7964efdfb005ee55d269412d5410649a2c1a3.tar.xz | |
layers: If layers receive bad filename for output log, report ERROR and fallback to stdout
| -rw-r--r-- | layers/draw_state.cpp | 5 | ||||
| -rw-r--r-- | layers/mem_tracker.cpp | 2 | ||||
| -rw-r--r-- | layers/param_checker.cpp | 5 | ||||
| -rw-r--r-- | layers/shader_checker.cpp | 6 |
4 files changed, 14 insertions, 4 deletions
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 6caced60..02f2e108 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -1308,8 +1308,11 @@ static void init_draw_state(layer_data *my_data) { log_output = fopen(option_str, "w"); } - if (log_output == NULL) + if (log_output == NULL) { + if (option_str) + cout << endl << "DrawState ERROR: Bad output filename specified: " << option_str << ". Writing to STDOUT instead" << endl << endl; log_output = stdout; + } layer_create_msg_callback(my_data->report_data, report_flags, log_callback, (void *) log_output, &my_data->logging_callback); } diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index 3517b105..2b82c667 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -1308,6 +1308,8 @@ static void init_mem_tracker( log_output = fopen(option_str, "w"); } if (log_output == NULL) { + if (option_str) + cout << endl << "MemTracker ERROR: Bad output filename specified: " << option_str << ". Writing to STDOUT instead" << endl << endl; log_output = stdout; } diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 9965c156..3d3ad0ce 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -93,8 +93,9 @@ static void InitParamChecker(layer_data *data) { log_output = fopen(option_str, "w"); } - if(log_output == NULL) - { + if (log_output == NULL) { + if (option_str) + std::cout << std::endl << "ParamChecker ERROR: Bad output filename specified: " << option_str << ". Writing to STDOUT instead" << std::endl << std::endl; log_output = stdout; } diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp index bb41906b..35dd415a 100644 --- a/layers/shader_checker.cpp +++ b/layers/shader_checker.cpp @@ -29,6 +29,7 @@ #include <map> #include <vector> #include <string> +#include <iostream> #include "vk_loader_platform.h" #include "vk_dispatch_table_helper.h" #include "vk_layer.h" @@ -218,8 +219,11 @@ init_shader_checker(layer_data *my_data) { log_output = fopen(option_str, "w"); } - if (log_output == NULL) + if (log_output == NULL) { + if (option_str) + std::cout << std::endl << "ShaderChecker ERROR: Bad output filename specified: " << option_str << ". Writing to STDOUT instead" << std::endl << std::endl; log_output = stdout; + } layer_create_msg_callback(my_data->report_data, report_flags, log_callback, (void *) log_output, &my_data->logging_callback); } |