lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-11-24 14:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

vk_device: Use an array to report lacking device limits

Browse source 
This makes easier to add and tune the required device limits.
This commit is contained in:
ReinUsesLisp 2020-12-26 02:09:55 -03:00
parent f687392e6f
commit 7344a7c447
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/video_core/renderer_vulkan/vk_device.cpp
View file

@ -567,20 +567,24 @@ void VKDevice::CheckSuitability() const {
LOG_ERROR(Render_Vulkan, "Missing required extension: {}", REQUIRED_EXTENSIONS[i]); LOG_ERROR(Render_Vulkan, "Missing required extension: {}", REQUIRED_EXTENSIONS[i]);
throw vk::Exception(VK_ERROR_EXTENSION_NOT_PRESENT); throw vk::Exception(VK_ERROR_EXTENSION_NOT_PRESENT);
} }
// TODO(Rodrigo): Check if the device matches all requeriments. struct LimitTuple {
u32 minimum;
u32 value;
const char* name;
};
const VkPhysicalDeviceLimits& limits{properties.limits}; const VkPhysicalDeviceLimits& limits{properties.limits};
const std::array limits_report{
constexpr u32 required_ubo_size = 65536; LimitTuple{65536, limits.maxUniformBufferRange, "maxUniformBufferRange"},
if (limits.maxUniformBufferRange < required_ubo_size) { LimitTuple{16, limits.maxViewports, "maxViewports"},
LOG_ERROR(Render_Vulkan, "Device UBO size {} is too small, {} is required", LimitTuple{8, limits.maxColorAttachments, "maxColorAttachments"},
limits.maxUniformBufferRange, required_ubo_size); LimitTuple{8, limits.maxClipDistances, "maxClipDistances"},
throw vk::Exception(VK_ERROR_FEATURE_NOT_PRESENT); };
} for (const auto& tuple : limits_report) {
constexpr u32 required_num_viewports = 16; if (tuple.value < tuple.minimum) {
if (limits.maxViewports < required_num_viewports) { LOG_ERROR(Render_Vulkan, "{} has to be {} or greater but it is {}", tuple.name,
LOG_INFO(Render_Vulkan, "Device number of viewports {} is too small, {} is required", tuple.minimum, tuple.value);
limits.maxViewports, required_num_viewports); throw vk::Exception(VK_ERROR_FEATURE_NOT_PRESENT);
throw vk::Exception(VK_ERROR_FEATURE_NOT_PRESENT); }
} }
const VkPhysicalDeviceFeatures features{physical.GetFeatures()}; const VkPhysicalDeviceFeatures features{physical.GetFeatures()};
const std::array feature_report{ const std::array feature_report{