history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-18 13:15:47 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

dep: Move Vulkan loader to common

Browse Source
This commit is contained in:
Connor McLaughlin
2022-07-08 21:49:27 +10:00
parent fd3507c16d
commit f89529015c
48 changed files with 57 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend-common/CMakeLists.txt
View File

@ -41,7 +41,7 @@ add_library(frontend-common
vulkan_host_display.h
)
target_link_libraries(frontend-common PUBLIC core common glad vulkan-loader cubeb imgui simpleini tinyxml2 rapidjson scmversion)
target_link_libraries(frontend-common PUBLIC core common glad cubeb imgui simpleini tinyxml2 rapidjson scmversion)
if(WIN32)
target_sources(frontend-common PRIVATE

2
src/frontend-common/frontend-common.props
View File

@ -4,7 +4,7 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\tinyxml2\include;$(SolutionDir)dep\glad\include;$(SolutionDir)dep\vulkan-loader\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)dep\simpleini\include;$(SolutionDir)dep\tinyxml2\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>$(RootBuildDir)simpleini\simpleini.lib;$(RootBuildDir)tinyxml2\tinyxml2.lib;$(RootBuildDir)core\core.lib;$(RootBuildDir)scmversion\scmversion.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
src/frontend-common/imgui_impl_vulkan.h
View File

@ -22,7 +22,7 @@
#pragma once
#include "vulkan_loader.h"
#include "common/vulkan/loader.h"
// Initialization data, for ImGui_ImplVulkan_Init()
// [Please zero-clear before use!]

8
src/frontend-common/vulkan_host_display.h
View File

@ -1,11 +1,11 @@
#pragma once
#include "common/vulkan/loader.h"
#include "common/vulkan/staging_texture.h"
#include "common/vulkan/stream_buffer.h"
#include "common/vulkan/swap_chain.h"
#include "common/window_info.h"
#include "core/host_display.h"
#include "postprocessing_chain.h"
#include "vulkan_loader.h"
#include <memory>
#include <string_view>
@ -30,9 +30,9 @@ public:
bool HasRenderSurface() const override;
bool CreateRenderDevice(const WindowInfo& wi, std::string_view adapter_name, bool debug_device,
bool threaded_presentation) override;
bool threaded_presentation) override;
bool InitializeRenderDevice(std::string_view shader_cache_directory, bool debug_device,
bool threaded_presentation) override;
bool threaded_presentation) override;
void DestroyRenderDevice() override;
bool MakeRenderContextCurrent() override;
@ -65,7 +65,7 @@ public:
bool Render() override;
bool RenderScreenshot(u32 width, u32 height, std::vector<u32>* out_pixels, u32* out_stride,
HostDisplayPixelFormat* out_format) override;
HostDisplayPixelFormat* out_format) override;
static AdapterAndModeList StaticGetAdapterAndModeList(const WindowInfo* wi);