From fb2af0e0e7dcc208bd21964292f37ab3bd271d38 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 22 Aug 2024 18:49:03 +0200
Subject: [PATCH] Fix regression in Sort Key usage

---
 Source/Engine/Renderer/RenderList.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Source/Engine/Renderer/RenderList.cpp b/Source/Engine/Renderer/RenderList.cpp
index 32bb43732..e733c60b5 100644
--- a/Source/Engine/Renderer/RenderList.cpp
+++ b/Source/Engine/Renderer/RenderList.cpp
@@ -485,6 +485,8 @@ struct PackedSortKey
     {
         uint64 Data;
 
+        PACK_BEGIN()
+
         struct
         {
             // Sorting order: By Sort Order -> By Material -> By Geometry -> By Distance
@@ -492,7 +494,7 @@ struct PackedSortKey
             uint8 DrawKey;
             uint16 BatchKey;
             uint8 SortKey;
-        };
+        } PACK_END();
     };
 };
 
@@ -665,7 +667,7 @@ void RenderList::SortDrawCalls(const RenderContext& renderContext, bool reverseD
             PackedSortKey key;
             key.Data = drawCall.SortKey;
             key.DistanceKey ^= MAX_uint32; // Reverse depth
-            key.SortKey ^= MAX_uint16; // Reverse sort order
+            key.SortKey ^= MAX_uint8; // Reverse sort order
             sortedKeys[i] = key.Data;
         }
     }