2 files changed, 9 insertions, 4 deletions
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp
index 4e9836c80..f89117521 100644
--- a/src/video_core/shader/shader.cpp
+++ b/src/video_core/shader/shader.cpp
@@ -9,6 +9,7 @@
 
 #include "common/hash.h"
 #include "common/make_unique.h"
+#include "common/microprofile.h"
 #include "common/profiler.h"
 
 #include "video_core/debug_utils/debug_utils.h"
@@ -51,15 +52,19 @@ void Setup(UnitState<false>& state) {
 }
 
 void Shutdown() {
+#ifdef ARCHITECTURE_x86_64
     shader_map.clear();
+#endif // ARCHITECTURE_x86_64
 }
 
 static Common::Profiling::TimingCategory shader_category("Vertex Shader");
+MICROPROFILE_DEFINE(GPU_VertexShader, "GPU", "Vertex Shader", MP_RGB(50, 50, 240));
 
 OutputVertex Run(UnitState<false>& state, const InputVertex& input, int num_attributes) {
     auto& config = g_state.regs.vs;
 
     Common::Profiling::ScopeTimer timer(shader_category);
+    MICROPROFILE_SCOPE(GPU_VertexShader);
 
     state.program_counter = config.main_offset;
     state.debug.max_offset = 0;
diff --git a/src/video_core/shader/shader_jit_x64.cpp b/src/video_core/shader/shader_jit_x64.cpp
index c8a669b51..d3cfe109e 100644
--- a/src/video_core/shader/shader_jit_x64.cpp
+++ b/src/video_core/shader/shader_jit_x64.cpp
@@ -493,8 +493,8 @@ void JitCompiler::Compile_MOVA(Instruction instr) {
 
     Compile_SwizzleSrc(instr, 1, instr.common.src1, SRC1);
 
-    // Convert floats to integers (only care about X and Y components)
-    CVTPS2DQ(SRC1, R(SRC1));
+    // Convert floats to integers using truncation (only care about X and Y components)
+    CVTTPS2DQ(SRC1, R(SRC1));
 
     // Get result
     MOVQ_xmm(R(RAX), SRC1);
@@ -768,12 +768,12 @@ CompiledShader* JitCompiler::Compile() {
     // Used to set a register to one
     static const __m128 one = { 1.f, 1.f, 1.f, 1.f };
     MOV(PTRBITS, R(RAX), ImmPtr(&one));
-    MOVAPS(ONE, MDisp(RAX, 0));
+    MOVAPS(ONE, MatR(RAX));
 
     // Used to negate registers
     static const __m128 neg = { -0.f, -0.f, -0.f, -0.f };
     MOV(PTRBITS, R(RAX), ImmPtr(&neg));
-    MOVAPS(NEGBIT, MDisp(RAX, 0));
+    MOVAPS(NEGBIT, MatR(RAX));
 
     looping = false;