diff options
| author | 2019-09-23 21:47:03 -0400 | |
|---|---|---|
| committer | 2019-09-23 21:47:03 -0400 | |
| commit | 376f1a443216196b71d4cf88c3dcdfe2bad57802 (patch) | |
| tree | 57e88bed1db9390700011cc03c1e1173f105023c /src/video_core/renderer_vulkan | |
| parent | Merge pull request #2901 from DarkLordZach/mainline-title-bar (diff) | |
| parent | gl_shader_decompiler: Use uint for images and fix SUATOM (diff) | |
| download | yuzu-376f1a443216196b71d4cf88c3dcdfe2bad57802.tar.gz yuzu-376f1a443216196b71d4cf88c3dcdfe2bad57802.tar.xz yuzu-376f1a443216196b71d4cf88c3dcdfe2bad57802.zip | |
Merge pull request #2869 from ReinUsesLisp/suld
shader/image: Implement SULD and fix SUATOM
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_shader_decompiler.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp b/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp index f7fbbb6e4..77fc58f25 100644 --- a/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp +++ b/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include "video_core/engines/shader_header.h" | 19 | #include "video_core/engines/shader_header.h" |
| 20 | #include "video_core/renderer_vulkan/vk_device.h" | 20 | #include "video_core/renderer_vulkan/vk_device.h" |
| 21 | #include "video_core/renderer_vulkan/vk_shader_decompiler.h" | 21 | #include "video_core/renderer_vulkan/vk_shader_decompiler.h" |
| 22 | #include "video_core/shader/node.h" | ||
| 22 | #include "video_core/shader/shader_ir.h" | 23 | #include "video_core/shader/shader_ir.h" |
| 23 | 24 | ||
| 24 | namespace Vulkan::VKShader { | 25 | namespace Vulkan::VKShader { |
| @@ -939,22 +940,17 @@ private: | |||
| 939 | return {}; | 940 | return {}; |
| 940 | } | 941 | } |
| 941 | 942 | ||
| 942 | Id ImageStore(Operation operation) { | 943 | Id ImageLoad(Operation operation) { |
| 943 | UNIMPLEMENTED(); | ||
| 944 | return {}; | ||
| 945 | } | ||
| 946 | |||
| 947 | Id AtomicImageAdd(Operation operation) { | ||
| 948 | UNIMPLEMENTED(); | 944 | UNIMPLEMENTED(); |
| 949 | return {}; | 945 | return {}; |
| 950 | } | 946 | } |
| 951 | 947 | ||
| 952 | Id AtomicImageMin(Operation operation) { | 948 | Id ImageStore(Operation operation) { |
| 953 | UNIMPLEMENTED(); | 949 | UNIMPLEMENTED(); |
| 954 | return {}; | 950 | return {}; |
| 955 | } | 951 | } |
| 956 | 952 | ||
| 957 | Id AtomicImageMax(Operation operation) { | 953 | Id AtomicImageAdd(Operation operation) { |
| 958 | UNIMPLEMENTED(); | 954 | UNIMPLEMENTED(); |
| 959 | return {}; | 955 | return {}; |
| 960 | } | 956 | } |
| @@ -1440,10 +1436,9 @@ private: | |||
| 1440 | &SPIRVDecompiler::TextureQueryLod, | 1436 | &SPIRVDecompiler::TextureQueryLod, |
| 1441 | &SPIRVDecompiler::TexelFetch, | 1437 | &SPIRVDecompiler::TexelFetch, |
| 1442 | 1438 | ||
| 1439 | &SPIRVDecompiler::ImageLoad, | ||
| 1443 | &SPIRVDecompiler::ImageStore, | 1440 | &SPIRVDecompiler::ImageStore, |
| 1444 | &SPIRVDecompiler::AtomicImageAdd, | 1441 | &SPIRVDecompiler::AtomicImageAdd, |
| 1445 | &SPIRVDecompiler::AtomicImageMin, | ||
| 1446 | &SPIRVDecompiler::AtomicImageMax, | ||
| 1447 | &SPIRVDecompiler::AtomicImageAnd, | 1442 | &SPIRVDecompiler::AtomicImageAnd, |
| 1448 | &SPIRVDecompiler::AtomicImageOr, | 1443 | &SPIRVDecompiler::AtomicImageOr, |
| 1449 | &SPIRVDecompiler::AtomicImageXor, | 1444 | &SPIRVDecompiler::AtomicImageXor, |