mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-08 01:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

vk: Use macros from Vulkan SDK

Browse source
This commit is contained in:
scribam 2019-06-12 22:51:40 +02:00 • committed by kd-11
commit a268415121
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rpcs3/Emu/RSX/VK/VKHelpers.h
View file

@ -482,7 +482,7 @@ private:
supported_extensions instance_extensions(supported_extensions::instance); supported_extensions instance_extensions(supported_extensions::instance);
supported_extensions device_extensions(supported_extensions::device, nullptr, dev); supported_extensions device_extensions(supported_extensions::device, nullptr, dev);
if (!instance_extensions.is_supported("VK_KHR_get_physical_device_properties2")) if (!instance_extensions.is_supported(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME))
{ {
vkGetPhysicalDeviceFeatures(dev, &features); vkGetPhysicalDeviceFeatures(dev, &features);
} }
@ -494,13 +494,13 @@ private:
VkPhysicalDeviceFloat16Int8FeaturesKHR shader_support_info{}; VkPhysicalDeviceFloat16Int8FeaturesKHR shader_support_info{};
if (device_extensions.is_supported("VK_KHR_shader_float16_int8")) if (device_extensions.is_supported(VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME))
{ {
shader_support_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR; shader_support_info.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR;
features2.pNext = &shader_support_info; features2.pNext = &shader_support_info;
} }
if (device_extensions.is_supported("VK_KHR_driver_properties")) if (device_extensions.is_supported(VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME))
{ {
driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR;
driver_properties.pNext = features2.pNext; driver_properties.pNext = features2.pNext;
@ -516,7 +516,7 @@ private:
features = features2.features; features = features2.features;
} }
stencil_export_support = device_extensions.is_supported("VK_EXT_shader_stencil_export"); stencil_export_support = device_extensions.is_supported(VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME);
} }
public: public:
@ -714,7 +714,7 @@ private:
VkPhysicalDeviceFeatures available_features = pgpu->features; VkPhysicalDeviceFeatures available_features = pgpu->features;
if (pgpu->shader_types_support.allow_float16) if (pgpu->shader_types_support.allow_float16)
{ {
requested_extensions.push_back("VK_KHR_shader_float16_int8"); requested_extensions.push_back(VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME);
} }
available_features.samplerAnisotropy = VK_TRUE; available_features.samplerAnisotropy = VK_TRUE;
@ -2397,7 +2397,7 @@ public:
app.applicationVersion = 0; app.applicationVersion = 0;
app.pEngineName = app_name; app.pEngineName = app_name;
app.engineVersion = 0; app.engineVersion = 0;
app.apiVersion = VK_MAKE_VERSION(1, 0, 0); app.apiVersion = VK_API_VERSION_1_0;
//Set up instance information //Set up instance information
@ -2415,9 +2415,9 @@ public:
extensions.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME); extensions.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME);
} }
if (support.is_supported("VK_KHR_get_physical_device_properties2")) if (support.is_supported(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME))
{ {
extensions.push_back("VK_KHR_get_physical_device_properties2"); extensions.push_back(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
} }
#ifdef _WIN32 #ifdef _WIN32
extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME); extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);