diff options
| author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2020-02-21 19:48:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-21 19:48:19 +0100 |
| commit | 6b2719c0bbf52d412230a36edcfc5793b29e868c (patch) | |
| tree | 82a70471860598f3a695bd8fda89a03f2ecf7325 | |
| parent | Merge pull request #3423 from ReinUsesLisp/no-match-3d (diff) | |
| parent | add vertex UnsignedInt size RGBA (diff) | |
| download | yuzu-6b2719c0bbf52d412230a36edcfc5793b29e868c.tar yuzu-6b2719c0bbf52d412230a36edcfc5793b29e868c.tar.gz yuzu-6b2719c0bbf52d412230a36edcfc5793b29e868c.tar.bz2 yuzu-6b2719c0bbf52d412230a36edcfc5793b29e868c.tar.lz yuzu-6b2719c0bbf52d412230a36edcfc5793b29e868c.tar.xz yuzu-6b2719c0bbf52d412230a36edcfc5793b29e868c.tar.zst yuzu-6b2719c0bbf52d412230a36edcfc5793b29e868c.zip | |
| -rw-r--r-- | src/video_core/renderer_vulkan/maxwell_to_vk.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_device.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp index 331808113..5403c3ab7 100644 --- a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp +++ b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp @@ -164,7 +164,7 @@ struct FormatTuple { {vk::Format::eUndefined, {}}, // ASTC_2D_5X4 {vk::Format::eUndefined, {}}, // BGRA8_SRGB {vk::Format::eBc1RgbaSrgbBlock, {}}, // DXT1_SRGB - {vk::Format::eUndefined, {}}, // DXT23_SRGB + {vk::Format::eBc2SrgbBlock, {}}, // DXT23_SRGB {vk::Format::eBc3SrgbBlock, {}}, // DXT45_SRGB {vk::Format::eBc7SrgbBlock, {}}, // BC7U_SRGB {vk::Format::eR4G4B4A4UnormPack16, Attachable}, // R4G4B4A4U @@ -363,6 +363,8 @@ vk::Format VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttr return vk::Format::eR8G8B8A8Uint; case Maxwell::VertexAttribute::Size::Size_32: return vk::Format::eR32Uint; + case Maxwell::VertexAttribute::Size::Size_32_32_32_32: + return vk::Format::eR32G32B32A32Uint; default: break; } diff --git a/src/video_core/renderer_vulkan/vk_device.cpp b/src/video_core/renderer_vulkan/vk_device.cpp index 588a6835f..3a77aced9 100644 --- a/src/video_core/renderer_vulkan/vk_device.cpp +++ b/src/video_core/renderer_vulkan/vk_device.cpp @@ -538,6 +538,7 @@ std::unordered_map<vk::Format, vk::FormatProperties> VKDevice::GetFormatProperti vk::Format::eBc6HUfloatBlock, vk::Format::eBc6HSfloatBlock, vk::Format::eBc1RgbaSrgbBlock, + vk::Format::eBc2SrgbBlock, vk::Format::eBc3SrgbBlock, vk::Format::eBc7SrgbBlock, vk::Format::eAstc4x4SrgbBlock, |