Make color cube app write to logcat on Android (#68)

* Make color cube app write to logcat on Android

The color cube test app does all its error reporting and logging
using std::cout. This works fine on desktop platforms but not
so well on Android. Android apps typically write to logcat, as
the standard handles are not easily accessible.

This introduces a AMDVulkanDemoVkUtils::Log() which writes to
logcat on Android, and stdout everywhere else. This also
changes all std::cout writes to use the new utility method.

Finally, the code that tries to create a Vulkan android surface
was neglecting to check if the operation succeeded. It wrote the
result code to stdout, but assumed success. It now checks and
aborts if the creation failed.

Change-Id: I9c731a3363227e3fc14289445f112526e1882689

* Avoid memory leak in error case

Author: jcortell68

source/examples/vulkan/vk_color_cube/gpa_helper.cc

@@ -6,6 +6,7 @@
 //==============================================================================
 
 #include "examples/vulkan/vk_color_cube/gpa_helper.h"
+#include "examples/vulkan/vk_color_cube/vk_util.h"
 
 #include <assert.h>
 
@@ -80,29 +81,29 @@ void GpaHelper::PrintGPACounterInfo(GpaContextId context_id) const
 
     if (kGpaStatusOk != gpa_status)
     {
-        std::cout << "ERROR: Failed to get device and revision id.\n";
+        AMDVulkanDemoVkUtils::Log("ERROR: Failed to get device and revision id.");
         return;
     }
 
     gpa_status = gpa_function_table_->GpaGetDeviceName(context_id, &device_name_ptr);
 
     if (kGpaStatusOk != gpa_status)
     {
-        std::cout << "ERROR: Failed to get the device name.\n";
+        AMDVulkanDemoVkUtils::Log("ERROR: Failed to get the device name.");
         return;
     }
     std::string device_name_string(device_name_ptr);
 
-    std::cout << "Device Id: " << std::showbase << std::hex << device_id << std::endl;
-    std::cout << "Revision Id: " << FormatRevisionId(revision_id) << std::endl;
-    std::cout << "Device Name: " << device_name_string.c_str() << std::endl;
+    AMDVulkanDemoVkUtils::Log("Device Id: 0x%04X", device_id);
+    AMDVulkanDemoVkUtils::Log("Revision Id: %s", FormatRevisionId(revision_id).c_str());
+    AMDVulkanDemoVkUtils::Log("Device Name: %s", device_name_string.c_str());
 
     GpaUInt32 num_counters = 0;
     gpa_status             = gpa_function_table_->GpaGetNumCounters(context_id, &num_counters);
 
     if (kGpaStatusOk != gpa_status)
     {
-        std::cout << "ERROR: Failed to get the number of available counters." << std::endl;
+        AMDVulkanDemoVkUtils::Log("ERROR: Failed to get the number of available counters.");
         return;
     }
 
@@ -119,11 +120,11 @@ void GpaHelper::PrintGPACounterInfo(GpaContextId context_id) const
 
         if (kGpaStatusOk == name_status && kGpaStatusOk == group_status && kGpaStatusOk == description_status)
         {
-            std::cout << counter_index << ": " << name << " \"" << group << "\" - " << description << std::endl;
+            AMDVulkanDemoVkUtils::Log("%d: %s \"%s\" - %s", counter_index, name, group, description);
         }
         else
         {
-            std::cout << "ERROR: Failed to get counter name, group, or description." << std::endl;
+            AMDVulkanDemoVkUtils::Log("ERROR: Failed to get counter name, group, or description.");
         }
     }
 }
@@ -233,6 +234,11 @@ void GpaHelper::gpaLoggingCallback(GpaLoggingType type, const char* msg)
     }
 
     gpa_log_file_stream << log_message << std::endl;
+
+#ifdef ANDROID
+    // Write the message to logcat
+    AMDVulkanDemoVkUtils::Log("%s", log_message.c_str());
+#endif
 }
 
 bool GpaHelper::CounterValueCompare(unsigned int profile_set,
@@ -655,36 +661,35 @@ void GpaHelper::PrintGpaSampleResults(GpaContextId context_id,
 
     if (kGpaStatusOk != gpa_status)
     {
-        std::cout << "ERROR: Failed to get device and revision id.\n";
+        AMDVulkanDemoVkUtils::Log("ERROR: Failed to get device and revision id.");
         return;
     }
 
     gpa_status = gpa_function_table_->GpaGetDeviceName(context_id, &device_name_ptr);
 
     if (kGpaStatusOk != gpa_status)
     {
-        std::cout << "ERROR: Failed to get the device name.\n";
+        AMDVulkanDemoVkUtils::Log("ERROR: Failed to get the device name.");
         return;
     }
 
     GpaHwGeneration hardware_generation = kGpaHwGenerationNone;
     gpa_status                          = gpa_function_table_->GpaGetDeviceGeneration(context_id, &hardware_generation);
     if (kGpaStatusOk != gpa_status)
     {
-        std::cout << "ERROR: Failed to get the device generation.\n";
+        AMDVulkanDemoVkUtils::Log("ERROR: Failed to get the device generation.");
         return;
     }
 
     std::string device_name_string(device_name_ptr);
 
     if (output_to_console)
     {
-        std::cout << "--------------------------------------------------" << std::endl;
-        std::cout << "Device Id: " << std::showbase << std::hex << device_id << std::endl;
-        std::cout << "Revision Id: " << FormatRevisionId(revision_id) << std::endl;
-        std::cout << "Device Name: " << device_name_string.c_str() << std::endl;
-        std::cout << "--------------------------------------------------" << std::endl;
-        std::cout << "Profile " << profile_set << ", Sample ID: " << sample_id << std::endl;
+        AMDVulkanDemoVkUtils::Log("Device Id: 0x%04X", device_id);
+        AMDVulkanDemoVkUtils::Log("Revision Id: %s", FormatRevisionId(revision_id).c_str());
+        AMDVulkanDemoVkUtils::Log("Device Name: %s", device_name_string.c_str());
+        AMDVulkanDemoVkUtils::Log("--------------------------------------------------");
+        AMDVulkanDemoVkUtils::Log("Profile %d, Sample ID: %d", profile_set, sample_id);
     }
 
     std::stringstream csv_header;
@@ -698,23 +703,23 @@ void GpaHelper::PrintGpaSampleResults(GpaContextId context_id,
 
     if (kGpaStatusOk != gpa_status)
     {
-        std::cout << "ERROR: Failed to get GPA sample result size." << std::endl;
+        AMDVulkanDemoVkUtils::Log("ERROR: Failed to get GPA sample result size.");
         return;
     }
 
     GpaUInt64* results_buffer = (GpaUInt64*)malloc(sample_result_size_in_bytes);
 
     if (results_buffer == nullptr)
     {
-        std::cout << "ERROR: Failed to allocate memory for GPA results." << std::endl;
+        AMDVulkanDemoVkUtils::Log("ERROR: Failed to allocate memory for GPA results.");
         return;
     }
 
     gpa_status = gpa_function_table_->GpaGetSampleResult(session_id, sample_id, sample_result_size_in_bytes, results_buffer);
 
     if (kGpaStatusOk != gpa_status)
     {
-        std::cout << "ERROR: Failed to get GPA sample results." << std::endl;
+        AMDVulkanDemoVkUtils::Log("ERROR: Failed to get GPA sample results.");
     }
     else
     {
@@ -723,7 +728,7 @@ void GpaHelper::PrintGpaSampleResults(GpaContextId context_id,
 
         if (kGpaStatusOk != gpa_status)
         {
-            std::cout << "ERROR: Failed to get the number of enabled counters from GPA." << std::endl;
+            AMDVulkanDemoVkUtils::Log("ERROR: Failed to get the number of enabled counters from GPA.");
         }
         else
         {
@@ -740,7 +745,7 @@ void GpaHelper::PrintGpaSampleResults(GpaContextId context_id,
 
                 if (kGpaStatusOk != gpa_status)
                 {
-                    std::cout << "ERROR: Failed to get the exposed GPA counter id of the enabled counter at index " << counter_index << "." << std::endl;
+                    AMDVulkanDemoVkUtils::Log("ERROR: Failed to get the exposed GPA counter id of the enabled counter at index %d", counter_index);
                 }
                 else
                 {