code: Address build issues

This commit is contained in:
GPUCode
2022-10-07 11:43:53 +03:00
parent ebfa98d31d
commit 6f3fc32a93
6 changed files with 11 additions and 6 deletions

View File

@ -169,3 +169,7 @@ endif()
add_library(vma INTERFACE)
target_include_directories(vma INTERFACE ./vma)
# vulkan-headers
add_library(vulkan-headers INTERFACE)
target_include_directories(vulkan-headers INTERFACE ./vulkan-headers/include)

View File

@ -39,6 +39,7 @@
#ifdef _WIN32
// windows.h needs to be included before shellapi.h
#include <windows.h>
#include <shellapi.h>
extern "C" {

View File

@ -260,7 +260,7 @@ endif()
create_target_directory_groups(citra-qt)
target_link_libraries(citra-qt PRIVATE audio_core common core input_common network video_core)
target_link_libraries(citra-qt PRIVATE Boost::boost glad vma nihstro-headers Qt5::Widgets Qt5::Multimedia)
target_link_libraries(citra-qt PRIVATE Boost::boost glad vma vulkan-headers nihstro-headers Qt5::Widgets Qt5::Multimedia)
target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
if (NOT WIN32)
@ -307,7 +307,7 @@ if(UNIX AND NOT APPLE)
install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
endif()
if (MSVC OR MINGW)
if (MSVC)
include(CopyCitraQt5Deps)
include(CopyCitraSDLDeps)
copy_citra_Qt5_deps(citra-qt)

View File

@ -188,9 +188,8 @@ endif()
create_target_directory_groups(video_core)
# Include Vulkan headers
target_include_directories(video_core PRIVATE ../../externals/vulkan-headers/include)
target_link_libraries(video_core PUBLIC common core)
target_link_libraries(video_core PRIVATE glad vma glm::glm SPIRV glslang nihstro-headers Boost::serialization)
target_link_libraries(video_core PRIVATE glad vma vulkan-headers glm::glm SPIRV glslang nihstro-headers Boost::serialization)
set_target_properties(video_core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})
if (ARCHITECTURE_x86_64)

View File

@ -150,11 +150,11 @@ void TaskScheduler::Submit(SubmitMode mode) {
const bool swapchain_sync = True(mode & SubmitMode::SwapchainSynced);
if (instance.IsTimelineSemaphoreSupported()) {
const u32 wait_semaphore_count = swapchain_sync ? 2u : 1u;
const std::array wait_values{command.fence_counter - 1, 1ul};
const std::array wait_values{command.fence_counter - 1, u64(1)};
const std::array wait_semaphores{timeline, command.image_acquired};
const u32 signal_semaphore_count = swapchain_sync ? 2u : 1u;
const std::array signal_values{command.fence_counter, 0ul};
const std::array signal_values{command.fence_counter, u64(0)};
const std::array signal_semaphores{timeline, command.present_ready};
const vk::TimelineSemaphoreSubmitInfoKHR timeline_si = {

View File

@ -8,6 +8,7 @@
#include "video_core/renderer_vulkan/vk_renderpass_cache.h"
#include "video_core/renderer_vulkan/vk_task_scheduler.h"
#include "video_core/renderer_vulkan/vk_texture_runtime.h"
#include <vulkan/vulkan_format_traits.hpp>
namespace Vulkan {