Fixed some accidental changes in previous commit

Author: jcortell68

source/examples/vulkan/vk_color_cube/vk_color_cube.cc

@@ -421,6 +421,7 @@ bool AMDVulkanDemo::InitializeGpa()
     if (kGpaStatusOk != status)
     {
         AMDVulkanDemoVkUtils::Log("ERROR: GpaGetFuncTable failed with status %d", status);
+        delete gpa_function_table;
         return false;
     }
 
@@ -1814,10 +1815,9 @@ void AMDVulkanDemo::DrawScene()
             // This example only renders one set of profiles (aka, only the number of passes needed to generate one set of results).
             unsigned int profile_set = 0;
 
-            // NOTE: we can't loop over these because it is not guaranteed that the sample_ids will be 0-based and monotonically increasing.
-            gpu_perf_api_helper_.PrintGpaSampleResults(gpa_context_id_, gpa_session_id_, profile_set, 0, print_debug_output_, Verify(), ConfirmSuccess());
-            gpu_perf_api_helper_.PrintGpaSampleResults(gpa_context_id_, gpa_session_id_, profile_set, 1, print_debug_output_, Verify(), ConfirmSuccess());
-            gpu_perf_api_helper_.PrintGpaSampleResults(gpa_context_id_, gpa_session_id_, profile_set, 2, print_debug_output_, Verify(), ConfirmSuccess());
+            gpu_perf_api_helper_.PrintGpaSampleResults(gpa_context_id_, gpa_session_id_, profile_set, AMDVulkanDemo::kGpaSampleIdCube,             print_debug_output_, Verify(), ConfirmSuccess());
+            gpu_perf_api_helper_.PrintGpaSampleResults(gpa_context_id_, gpa_session_id_, profile_set, AMDVulkanDemo::kGpaSampleIdWireframe,        print_debug_output_, Verify(), ConfirmSuccess());
+            gpu_perf_api_helper_.PrintGpaSampleResults(gpa_context_id_, gpa_session_id_, profile_set, AMDVulkanDemo::kGpaSampleIdCubeAndWireframe, print_debug_output_, Verify(), ConfirmSuccess());
 
             // Close the CSV file so that it actually gets saved out.
             gpu_perf_api_helper_.CloseCSVFile();

source/examples/vulkan/vk_color_cube/vk_color_cube.h

@@ -142,6 +142,13 @@ class AMDVulkanDemo : public gpa_example::GpaSampleApp
     /// Default window height.
     const uint32_t kDefaultWindowHeight = 300;
 
+    /// Note that GPA sample IDs are client defined. However, the Vulkan GPA
+    /// extension assigns an ID to each sample (they are not client defined).
+    /// The GPA library manages the mapping between them. These are the former.
+    static constexpr GpaUInt32 kGpaSampleIdCube = 0;
+    static constexpr GpaUInt32 kGpaSampleIdWireframe = 1;
+    static constexpr GpaUInt32 kGpaSampleIdCubeAndWireframe = 2;
+
 #ifdef ANDROID
     inline void SetWindow(ANativeWindow* native_window)
     {
@@ -242,7 +249,7 @@ class AMDVulkanDemo : public gpa_example::GpaSampleApp
 
             /// Sample Id that the application (not GPA) assigns to the cube.
             /// The cube will have this same sample_id in all passes.
-            const GpaUInt32 gpa_sample_id = 0;
+            const GpaUInt32 gpa_sample_id = kGpaSampleIdCube;
         } cube_;
 
         /// @brief Container for objects related to drawing the wireframe.
@@ -256,7 +263,7 @@ class AMDVulkanDemo : public gpa_example::GpaSampleApp
 
             /// Sample Id that the application (not GPA) assigns to the wireframe.
             /// The wireframe will have this same sample_id in all passes.
-            const GpaUInt32 gpa_sample_id = 1;
+            const GpaUInt32 gpa_sample_id = kGpaSampleIdWireframe;
         } wire_frame_;
 
         /// @brief Container for objects related to drawing the cube and wireframe.
@@ -279,7 +286,7 @@ class AMDVulkanDemo : public gpa_example::GpaSampleApp
 
             /// Sample Id that the application (not GPA) assigns to the cube wireframe.
             /// The combined cube + wireframe sample will have this same sample_id in all passes.
-            const GpaUInt32 gpa_sample_id = 2;
+            const GpaUInt32 gpa_sample_id = kGpaSampleIdCubeAndWireframe;
         } cube_and_wire_frame_;
     };
 

source/gpu_perf_api_common/gpu_perf_api.cc

@@ -47,7 +47,7 @@ extern IGpaImplementor* gpa_imp;  ///< GPA implementor instance.
     }                                                                                                         \
     if (index >= num_counters)                                                                                \
     {                                                                                                         \
-        GPA_LOG_ERROR("Parameter index is %d but must be less than %d.", index, num_counters);                \
+        GPA_LOG_ERROR("Parameter %s is %d but must be less than %d.", #index, index, num_counters);           \
         return kGpaStatusErrorIndexOutOfRange;                                                                \
     }
 
@@ -493,15 +493,6 @@ GPA_LIB_DECL GpaStatus GpaGetDeviceGeneration(GpaContextId gpa_context_id, GpaHw
             case GDT_HW_GENERATION_GFX11:
                 *hardware_generation = kGpaHwGenerationGfx11;
                 break;
-            case GDT_HW_GENERATION_GFX104:
-                *hardware_generation = kGpaHwGenerationGfx104;
-                break;
-            case GDT_HW_GENERATION_GFX401:
-                *hardware_generation = kGpaHwGenerationGfx401;
-                break;
-            case GDT_HW_GENERATION_GFX402:
-                *hardware_generation = kGpaHwGenerationGfx402;
-                break;
             case GDT_HW_GENERATION_LAST:
                 *hardware_generation = kGpaHwGenerationLast;
                 break;
@@ -856,8 +847,6 @@ GPA_LIB_DECL GpaStatus GpaDeleteSession(GpaSessionId gpa_session_id)
 
 GPA_LIB_DECL GpaStatus GpaBeginSession(GpaSessionId gpa_session_id)
 {
-    GPA_LOG_ERROR("jjjjjjjjjjjjj GpaBeginSession");
-
     try
     {
         PROFILE_FUNCTION(GpaBeginSession);