VkVSCommon: avoid vulkan includes

As some includes are not available in CTS such as
vk_enum_string_helper.h, avoid to include it
and just stringify the VkResult.

Author: dabrain34

common/include/VkVSCommon.h

@@ -40,11 +40,6 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 
-// C++ only macros and utilities
-#include <iostream>
-#include <vulkan/vulkan.h>
-#include "vk_enum_string_helper.h"
-
 // Macro to check Vulkan features and return error if not supported
 // Note: This macro contains a return statement - use with care
 #define CHECK_VULKAN_FEATURE(feature, name, optional) \
@@ -62,21 +57,6 @@ extern "C" {
 #define VKVS_CASE_STR(x) case x: return VKVS_STRINGIFY(x)
 #endif
 
-// Helper function to get string representation of VkResult codes
-// Handles video-specific extension codes and falls back to generated string_VkResult()
-inline const char* string_VkResult_Extended(VkResult result) {
-    // First try video-specific error codes
-    switch (result) {
-        VKVS_CASE_STR(VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR);
-        VKVS_CASE_STR(VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR);
-        VKVS_CASE_STR(VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR);
-        VKVS_CASE_STR(VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR);
-        default:
-            // Fall back to generated string_VkResult()
-            return string_VkResult(result);
-    }
-}
-
 // Helper function to check if a VkResult indicates video profile/feature not supported
 // Returns true for video-specific KHR errors (profile, format, codec, std version)
 // and general Vulkan capability errors (format, feature, driver, extension)

common/libs/VkCodecUtils/VulkanVideoProcessor.cpp

@@ -136,7 +136,7 @@ VkResult VulkanVideoProcessor::Initialize(const VulkanDeviceContext* vkDevCtx,
 
     if (result != VK_SUCCESS) {
         std::cerr << "FATAL ERROR: Video decode capabilities not supported for this codec/profile!" << std::endl;
-        std::cerr << "GetVideoDecodeCapabilities failed with error: " << string_VkResult_Extended(result) << std::endl;
+        std::cerr << "GetVideoDecodeCapabilities failed with error: " << VKVS_STRINGIFY(result) << std::endl;
         return result;
     }
 

vk_video_encoder/libs/VkVideoEncoder/VkEncoderConfigAV1.cpp

@@ -15,7 +15,6 @@
 */
 
 #include "VkVideoEncoder/VkEncoderConfigAV1.h"
-#include "vk_enum_string_helper.h"
 
 #define READ_PARAM(i, param, type) {                            \
     int32_t data = 0;                                           \
@@ -204,11 +203,11 @@ VkResult EncoderConfigAV1::InitDeviceCapabilities(const VulkanDeviceContext* vkD
         if (IsVideoUnsupportedResult(result)) {
             // Not supported by hardware/driver - return VK_ERROR_INCOMPATIBLE_DRIVER
             std::cerr << "*** Video encode capabilities not supported by hardware/driver ("
-                      << string_VkResult_Extended(result) << ") ***" << std::endl;
+                      << VKVS_STRINGIFY(result) << ") ***" << std::endl;
             return VK_ERROR_INCOMPATIBLE_DRIVER;
         }
         // Actual error (e.g., out of memory)
-        std::cerr << "*** Error getting video capabilities: " << string_VkResult_Extended(result) << " ***" << std::endl;
+        std::cerr << "*** Error getting video capabilities: " << VKVS_STRINGIFY(result) << " ***" << std::endl;
         return result;
     }
 

vk_video_encoder/libs/VkVideoEncoder/VkEncoderConfigH264.cpp

@@ -16,7 +16,6 @@
 
 #include "VkVideoEncoder/VkEncoderConfigH264.h"
 #include "VkVideoEncoder/VkVideoEncoderH264.h"
-#include "vk_enum_string_helper.h"
 
 int EncoderConfigH264::DoParseArguments(int argc, char* argv[])
 {
@@ -407,11 +406,11 @@ VkResult EncoderConfigH264::InitDeviceCapabilities(const VulkanDeviceContext* vk
         if (IsVideoUnsupportedResult(result)) {
             // Not supported by hardware/driver - return VK_ERROR_INCOMPATIBLE_DRIVER
             std::cerr << "*** Video encode capabilities not supported by hardware/driver ("
-                      << string_VkResult_Extended(result) << ") ***" << std::endl;
+                      << VKVS_STRINGIFY(result) << ") ***" << std::endl;
             return VK_ERROR_INCOMPATIBLE_DRIVER;
         }
         // Actual error (e.g., out of memory)
-        std::cerr << "*** Error getting video capabilities: " << string_VkResult_Extended(result) << " ***" << std::endl;
+        std::cerr << "*** Error getting video capabilities: " << VKVS_STRINGIFY(result) << " ***" << std::endl;
         return result;
     }
 

vk_video_encoder/libs/VkVideoEncoder/VkEncoderConfigH265.cpp

@@ -17,7 +17,6 @@
 #include <math.h>       /* sqrt */
 #include "VkVideoEncoder/VkEncoderConfigH265.h"
 #include "VkVideoEncoder/VkVideoEncoderH265.h"
-#include "vk_enum_string_helper.h"
 
 static void SetupAspectRatio(StdVideoH265SequenceParameterSetVui *vui, uint32_t width, uint32_t height,
                              uint32_t darWidth, uint32_t darHeight)
@@ -128,11 +127,11 @@ VkResult EncoderConfigH265::InitDeviceCapabilities(const VulkanDeviceContext* vk
         if (IsVideoUnsupportedResult(result)) {
             // Not supported by hardware/driver - return VK_ERROR_INCOMPATIBLE_DRIVER
             std::cerr << "*** Video encode capabilities not supported by hardware/driver ("
-                      << string_VkResult_Extended(result) << ") ***" << std::endl;
+                      << VKVS_STRINGIFY(result) << ") ***" << std::endl;
             return VK_ERROR_INCOMPATIBLE_DRIVER;
         }
         // Actual error (e.g., out of memory)
-        std::cerr << "*** Error getting video capabilities: " << string_VkResult_Extended(result) << " ***" << std::endl;
+        std::cerr << "*** Error getting video capabilities: " << VKVS_STRINGIFY(result) << " ***" << std::endl;
         return result;
     }
 
@@ -153,7 +152,7 @@ VkResult EncoderConfigH265::InitDeviceCapabilities(const VulkanDeviceContext* vk
                                                                                  qualityLevelProperties,
                                                                                  h265QualityLevelProperties);
     if (result != VK_SUCCESS) {
-        std::cout << "*** Could not get Video Encode QualityLevel Properties :" << string_VkResult_Extended(result) << " ***" << std::endl;
+        std::cout << "*** Could not get Video Encode QualityLevel Properties :" << VKVS_STRINGIFY(result) << " ***" << std::endl;
         return result;
     }