diff --git a/inc/hgl/graph/VKDebugUtils.h b/inc/hgl/graph/VKDebugUtils.h index a159b5d4..124363d9 100644 --- a/inc/hgl/graph/VKDebugUtils.h +++ b/inc/hgl/graph/VKDebugUtils.h @@ -77,10 +77,10 @@ public: DU_FUNC(DisplayKHR, DISPLAY_KHR) DU_FUNC(DisplayModeKHR, DISPLAY_MODE_KHR) DU_FUNC(DebugReportCallbackEXT, DEBUG_REPORT_CALLBACK_EXT) -#ifdef VK_ENABLE_BETA_EXTENSIONS + DU_FUNC(VideoSessionKHR, VIDEO_SESSION_KHR) - DU_FUNC(VideoSessionParametersKHR, VIDEO_SESSION_PARAMETERS_KH) -#endif//VK_ENABLE_BETA_EXTENSIONS + DU_FUNC(VideoSessionParametersKHR, VIDEO_SESSION_PARAMETERS_KHR) + DU_FUNC(CuModuleNVX, CU_MODULE_NVX) DU_FUNC(CuFunctionNVX, CU_FUNCTION_NVX) DU_FUNC(DebugUtilsMessengerEXT, DEBUG_UTILS_MESSENGER_EXT) diff --git a/inc/hgl/graph/VKDeviceAttribute.h b/inc/hgl/graph/VKDeviceAttribute.h index b6ffea2b..20e2445e 100644 --- a/inc/hgl/graph/VKDeviceAttribute.h +++ b/inc/hgl/graph/VKDeviceAttribute.h @@ -24,11 +24,9 @@ struct GPUDeviceAttribute uint32_t graphics_family =ERROR_FAMILY_INDEX; uint32_t present_family =ERROR_FAMILY_INDEX; uint32_t compute_family =ERROR_FAMILY_INDEX; + uint32_t transfer_family =ERROR_FAMILY_INDEX; uint32_t video_decode_family =ERROR_FAMILY_INDEX; - -#ifdef VK_ENABLE_BETA_EXTENSIONS uint32_t video_encode_family =ERROR_FAMILY_INDEX; -#endif//VK_ENABLE_BETA_EXTENSIONS VkQueue graphics_queue =VK_NULL_HANDLE; VkQueue present_queue =VK_NULL_HANDLE; diff --git a/src/SceneGraph/RenderFramework.cpp b/src/SceneGraph/RenderFramework.cpp index d711da21..89ab5f8c 100644 --- a/src/SceneGraph/RenderFramework.cpp +++ b/src/SceneGraph/RenderFramework.cpp @@ -146,8 +146,6 @@ bool RenderFramework::Init(uint w,uint h,const OSString &app_name) win->Join(this); - - return(true); } diff --git a/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp b/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp index 023897f1..3a15a4bf 100644 --- a/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceAttribute.cpp @@ -133,13 +133,17 @@ void GPUDeviceAttribute::GetQueueFamily() video_decode_family = i; } -#ifdef VK_ENABLE_BETA_EXTENSIONS if(fp->queueFlags & VK_QUEUE_VIDEO_ENCODE_BIT_KHR) { if (video_encode_family == ERROR_FAMILY_INDEX) video_encode_family = i; } -#endif//VK_ENABLE_BETA_EXTENSIONS + + if(fp->queueFlags & VK_QUEUE_TRANSFER_BIT) + { + if(transfer_family == ERROR_FAMILY_INDEX) + transfer_family = i; + } if(fp->queueFlags & VK_QUEUE_COMPUTE_BIT) {