preserve-emulation/simple64
1
0
Fork 0
mirror of https://github.com/simple64/simple64.git synced 2026-09-07 04:42:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

update parallel rdp

Browse Source
This commit is contained in:
Logan McNaughton
2022-09-21 16:22:14 -06:00
parent b7cd69ae4d
commit f93a11313e
7 changed files with 61 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parallel-rdp-standalone/vulkan/context.cpp
+8 -35
View File
@@ -59,7 +59,7 @@ bool Context::init_instance_and_device(const char **instance_ext, uint32_t insta
}
VkPhysicalDeviceFeatures features = {};
if (!create_device(VK_NULL_HANDLE, VK_NULL_HANDLE, device_ext, device_ext_count, nullptr, 0, &features, flags))
if (!create_device(VK_NULL_HANDLE, VK_NULL_HANDLE, device_ext, device_ext_count, &features, flags))
{
destroy();
LOGE("Failed to create Vulkan device.\n");
@@ -96,6 +96,8 @@ bool Context::init_loader(PFN_vkGetInstanceProcAddr addr)
#ifdef __APPLE__
if (!module)
module = dlopen("libvulkan.1.dylib", RTLD_LOCAL | RTLD_LAZY);
if (!module)
module = dlopen("libMoltenVK.dylib", RTLD_LOCAL | RTLD_LAZY);
#else
if (!module)
module = dlopen("libvulkan.so.1", RTLD_LOCAL | RTLD_LAZY);
@@ -161,7 +163,6 @@ bool Context::init_from_instance_and_device(VkInstance instance_, VkPhysicalDevi
bool Context::init_device_from_instance(VkInstance instance_, VkPhysicalDevice gpu_, VkSurfaceKHR surface,
const char **required_device_extensions, unsigned num_required_device_extensions,
const char **required_device_layers, unsigned num_required_device_layers,
const VkPhysicalDeviceFeatures *required_features,
ContextCreationFlags flags)
{
@@ -174,8 +175,7 @@ bool Context::init_device_from_instance(VkInstance instance_, VkPhysicalDevice g
if (!create_instance(nullptr, 0))
return false;
if (!create_device(gpu_, surface, required_device_extensions, num_required_device_extensions, required_device_layers,
num_required_device_layers, required_features, flags))
if (!create_device(gpu_, surface, required_device_extensions, num_required_device_extensions, required_features, flags))
{
destroy();
LOGE("Failed to create Vulkan device.\n");
@@ -466,8 +466,7 @@ QueueInfo::QueueInfo()
}
bool Context::create_device(VkPhysicalDevice gpu_, VkSurfaceKHR surface, const char **required_device_extensions,
unsigned num_required_device_extensions, const char **required_device_layers,
unsigned num_required_device_layers, const VkPhysicalDeviceFeatures *required_features,
unsigned num_required_device_extensions, const VkPhysicalDeviceFeatures *required_features,
ContextCreationFlags flags)
{
gpu = gpu_;
@@ -535,12 +534,6 @@ bool Context::create_device(VkPhysicalDevice gpu_, VkSurfaceKHR surface, const c
if (ext_count)
vkEnumerateDeviceExtensionProperties(gpu, nullptr, &ext_count, queried_extensions.data());
uint32_t layer_count = 0;
vkEnumerateDeviceLayerProperties(gpu, &layer_count, nullptr);
std::vector<VkLayerProperties> queried_layers(layer_count);
if (layer_count)
vkEnumerateDeviceLayerProperties(gpu, &layer_count, queried_layers.data());
const auto has_extension = [&](const char *name) -> bool {
auto itr = find_if(begin(queried_extensions), end(queried_extensions), [name](const VkExtensionProperties &e) -> bool {
return strcmp(e.extensionName, name) == 0;
@@ -548,21 +541,10 @@ bool Context::create_device(VkPhysicalDevice gpu_, VkSurfaceKHR surface, const c
return itr != end(queried_extensions);
};
const auto has_layer = [&](const char *name) -> bool {
auto itr = find_if(begin(queried_layers), end(queried_layers), [name](const VkLayerProperties &e) -> bool {
return strcmp(e.layerName, name) == 0;
});
return itr != end(queried_layers);
};
for (uint32_t i = 0; i < num_required_device_extensions; i++)
if (!has_extension(required_device_extensions[i]))
return false;
for (uint32_t i = 0; i < num_required_device_layers; i++)
if (!has_layer(required_device_layers[i]))
return false;
vkGetPhysicalDeviceProperties(gpu, &gpu_props);
if (gpu_props.apiVersion < VK_API_VERSION_1_1)
@@ -699,12 +681,9 @@ bool Context::create_device(VkPhysicalDevice gpu_, VkSurfaceKHR surface, const c
device_info.queueCreateInfoCount = uint32_t(queue_infos.size());
std::vector<const char *> enabled_extensions;
std::vector<const char *> enabled_layers;
for (uint32_t i = 0; i < num_required_device_extensions; i++)
enabled_extensions.push_back(required_device_extensions[i]);
for (uint32_t i = 0; i < num_required_device_layers; i++)
enabled_layers.push_back(required_device_layers[i]);
if (has_extension(VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME))
{
@@ -786,6 +765,9 @@ bool Context::create_device(VkPhysicalDevice gpu_, VkSurfaceKHR surface, const c
ext.supports_shader_float_control = true;
}
if (has_extension(VK_EXT_TOOLING_INFO_EXTENSION_NAME))
ext.supports_tooling_info = true;
#ifdef GRANITE_VULKAN_BETA
if (has_extension(VK_KHR_VIDEO_QUEUE_EXTENSION_NAME))
{
@@ -1067,13 +1049,6 @@ bool Context::create_device(VkPhysicalDevice gpu_, VkSurfaceKHR surface, const c
device_info.pNext = &features;
#ifdef VULKAN_DEBUG
if (!force_no_validation && has_layer("VK_LAYER_KHRONOS_validation"))
enabled_layers.push_back("VK_LAYER_KHRONOS_validation");
else if (!force_no_validation && has_layer("VK_LAYER_LUNARG_standard_validation"))
enabled_layers.push_back("VK_LAYER_LUNARG_standard_validation");
#endif
if (ext.supports_external && has_extension(VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME))
{
ext.supports_external_memory_host = true;
@@ -1149,8 +1124,6 @@ bool Context::create_device(VkPhysicalDevice gpu_, VkSurfaceKHR surface, const c
device_info.enabledExtensionCount = enabled_extensions.size();
device_info.ppEnabledExtensionNames = enabled_extensions.empty() ? nullptr : enabled_extensions.data();
device_info.enabledLayerCount = enabled_layers.size();
device_info.ppEnabledLayerNames = enabled_layers.empty() ? nullptr : enabled_layers.data();
for (auto *enabled_extension : enabled_extensions)
LOGI("Enabling device extension: %s.\n", enabled_extension);