summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2019-05-26 03:09:06 -0300
committerGravatar ReinUsesLisp2019-05-26 03:09:06 -0300
commitf424b460369839a6950749babd5cc3e7cf9635dd (patch)
tree367b574582b97cb0bfe0c585d1ceaa4bdc6eadc3 /src
parentvk_shader_decompiler: Misc fixes (diff)
downloadyuzu-f424b460369839a6950749babd5cc3e7cf9635dd.tar.gz
yuzu-f424b460369839a6950749babd5cc3e7cf9635dd.tar.xz
yuzu-f424b460369839a6950749babd5cc3e7cf9635dd.zip
vk_device: Let formats array type be deduced
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_vulkan/vk_device.cpp66
1 files changed, 33 insertions, 33 deletions
diff --git a/src/video_core/renderer_vulkan/vk_device.cpp b/src/video_core/renderer_vulkan/vk_device.cpp
index f39985c40..3b966ddc3 100644
--- a/src/video_core/renderer_vulkan/vk_device.cpp
+++ b/src/video_core/renderer_vulkan/vk_device.cpp
@@ -275,39 +275,39 @@ std::vector<vk::DeviceQueueCreateInfo> VKDevice::GetDeviceQueueCreateInfos() con
275 275
276std::map<vk::Format, vk::FormatProperties> VKDevice::GetFormatProperties( 276std::map<vk::Format, vk::FormatProperties> VKDevice::GetFormatProperties(
277 const vk::DispatchLoaderDynamic& dldi, vk::PhysicalDevice physical) { 277 const vk::DispatchLoaderDynamic& dldi, vk::PhysicalDevice physical) {
278 static constexpr std::array<vk::Format, 33> formats = {vk::Format::eA8B8G8R8UnormPack32, 278 static constexpr std::array formats{vk::Format::eA8B8G8R8UnormPack32,
279 vk::Format::eB5G6R5UnormPack16, 279 vk::Format::eB5G6R5UnormPack16,
280 vk::Format::eA2B10G10R10UnormPack32, 280 vk::Format::eA2B10G10R10UnormPack32,
281 vk::Format::eR32G32B32A32Sfloat, 281 vk::Format::eR32G32B32A32Sfloat,
282 vk::Format::eR16G16Unorm, 282 vk::Format::eR16G16Unorm,
283 vk::Format::eR16G16Snorm, 283 vk::Format::eR16G16Snorm,
284 vk::Format::eR8G8B8A8Srgb, 284 vk::Format::eR8G8B8A8Srgb,
285 vk::Format::eR8Unorm, 285 vk::Format::eR8Unorm,
286 vk::Format::eB10G11R11UfloatPack32, 286 vk::Format::eB10G11R11UfloatPack32,
287 vk::Format::eR32Sfloat, 287 vk::Format::eR32Sfloat,
288 vk::Format::eR16Sfloat, 288 vk::Format::eR16Sfloat,
289 vk::Format::eR16G16B16A16Sfloat, 289 vk::Format::eR16G16B16A16Sfloat,
290 vk::Format::eD32Sfloat, 290 vk::Format::eD32Sfloat,
291 vk::Format::eD16Unorm, 291 vk::Format::eD16Unorm,
292 vk::Format::eD16UnormS8Uint, 292 vk::Format::eD16UnormS8Uint,
293 vk::Format::eD24UnormS8Uint, 293 vk::Format::eD24UnormS8Uint,
294 vk::Format::eD32SfloatS8Uint, 294 vk::Format::eD32SfloatS8Uint,
295 vk::Format::eBc1RgbaUnormBlock, 295 vk::Format::eBc1RgbaUnormBlock,
296 vk::Format::eBc2UnormBlock, 296 vk::Format::eBc2UnormBlock,
297 vk::Format::eBc3UnormBlock, 297 vk::Format::eBc3UnormBlock,
298 vk::Format::eBc4UnormBlock, 298 vk::Format::eBc4UnormBlock,
299 vk::Format::eBc5UnormBlock, 299 vk::Format::eBc5UnormBlock,
300 vk::Format::eBc5SnormBlock, 300 vk::Format::eBc5SnormBlock,
301 vk::Format::eBc7UnormBlock, 301 vk::Format::eBc7UnormBlock,
302 vk::Format::eAstc4x4UnormBlock, 302 vk::Format::eAstc4x4UnormBlock,
303 vk::Format::eAstc4x4SrgbBlock, 303 vk::Format::eAstc4x4SrgbBlock,
304 vk::Format::eAstc8x8SrgbBlock, 304 vk::Format::eAstc8x8SrgbBlock,
305 vk::Format::eAstc8x6SrgbBlock, 305 vk::Format::eAstc8x6SrgbBlock,
306 vk::Format::eAstc5x4SrgbBlock, 306 vk::Format::eAstc5x4SrgbBlock,
307 vk::Format::eAstc5x5UnormBlock, 307 vk::Format::eAstc5x5UnormBlock,
308 vk::Format::eAstc5x5SrgbBlock, 308 vk::Format::eAstc5x5SrgbBlock,
309 vk::Format::eAstc10x8UnormBlock, 309 vk::Format::eAstc10x8UnormBlock,
310 vk::Format::eAstc10x8SrgbBlock}; 310 vk::Format::eAstc10x8SrgbBlock};
311 std::map<vk::Format, vk::FormatProperties> format_properties; 311 std::map<vk::Format, vk::FormatProperties> format_properties;
312 for (const auto format : formats) { 312 for (const auto format : formats) {
313 format_properties.emplace(format, physical.getFormatProperties(format, dldi)); 313 format_properties.emplace(format, physical.getFormatProperties(format, dldi));
HIC SVNT DRACONES