From 9014861858295489cf597322801b37dad9aaf2ce Mon Sep 17 00:00:00 2001
From: ameerj <aj662@drexel.edu>
Date: Wed, 18 Nov 2020 20:08:51 -0500
Subject: vulkan_renderer: Alpha Test Culling Implementation

Used by various textures in many titles, e.g.  SSBU menu.
---
 src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/video_core/renderer_vulkan/vk_pipeline_cache.cpp')

diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index dedc9c466..9ccf5d011 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -344,6 +344,14 @@ VKPipelineCache::DecompileShaders(const FixedPipelineState& fixed_state) {
     }
     specialization.ndc_minus_one_to_one = fixed_state.ndc_minus_one_to_one;
 
+    // Alpha test
+    if (fixed_state.alpha_test_enabled == 1) {
+        specialization.alpha_test_enabled = true;
+        specialization.alpha_test_func = static_cast<u8>(fixed_state.alpha_test_func);
+        // memcpy from u32 to float TODO: C++20 std::bit_cast
+        std::memcpy(&specialization.alpha_test_ref, &fixed_state.alpha_test_ref, sizeof(float));
+    }
+
     SPIRVProgram program;
     std::vector<VkDescriptorSetLayoutBinding> bindings;
 
-- 
cgit v1.2.3


From 1dbf71ceb3b84691101228a2981cafed477b27e9 Mon Sep 17 00:00:00 2001
From: ameerj <aj662@drexel.edu>
Date: Thu, 19 Nov 2020 02:25:37 -0500
Subject: Address PR feedback from Rein

---
 src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/video_core/renderer_vulkan/vk_pipeline_cache.cpp')

diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index 9ccf5d011..a66a841fb 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -345,12 +345,10 @@ VKPipelineCache::DecompileShaders(const FixedPipelineState& fixed_state) {
     specialization.ndc_minus_one_to_one = fixed_state.ndc_minus_one_to_one;
 
     // Alpha test
-    if (fixed_state.alpha_test_enabled == 1) {
-        specialization.alpha_test_enabled = true;
-        specialization.alpha_test_func = static_cast<u8>(fixed_state.alpha_test_func);
-        // memcpy from u32 to float TODO: C++20 std::bit_cast
-        std::memcpy(&specialization.alpha_test_ref, &fixed_state.alpha_test_ref, sizeof(float));
-    }
+    specialization.alpha_test_func =
+        FixedPipelineState::UnpackComparisonOp(fixed_state.alpha_test_func.Value());
+    // memcpy from u32 to float TODO: C++20 std::bit_cast
+    std::memcpy(&specialization.alpha_test_ref, &fixed_state.alpha_test_ref, sizeof(float));
 
     SPIRVProgram program;
     std::vector<VkDescriptorSetLayoutBinding> bindings;
-- 
cgit v1.2.3


From e87670ee48c896ba029a11ad590234e00260f875 Mon Sep 17 00:00:00 2001
From: ameerj <aj662@drexel.edu>
Date: Wed, 25 Nov 2020 00:33:20 -0500
Subject: Refactor MaxwellToSpirvComparison. Use Common::BitCast

Co-Authored-By: Rodrigo Locatti <reinuseslisp@airmail.cc>
---
 src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/video_core/renderer_vulkan/vk_pipeline_cache.cpp')

diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index a66a841fb..f9efe526d 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -7,6 +7,7 @@
 #include <memory>
 #include <vector>
 
+#include "common/bit_cast.h"
 #include "common/microprofile.h"
 #include "core/core.h"
 #include "core/memory.h"
@@ -347,8 +348,7 @@ VKPipelineCache::DecompileShaders(const FixedPipelineState& fixed_state) {
     // Alpha test
     specialization.alpha_test_func =
         FixedPipelineState::UnpackComparisonOp(fixed_state.alpha_test_func.Value());
-    // memcpy from u32 to float TODO: C++20 std::bit_cast
-    std::memcpy(&specialization.alpha_test_ref, &fixed_state.alpha_test_ref, sizeof(float));
+    specialization.alpha_test_ref = Common::BitCast<float>(fixed_state.alpha_test_ref);
 
     SPIRVProgram program;
     std::vector<VkDescriptorSetLayoutBinding> bindings;
-- 
cgit v1.2.3