Fix decoding of block after shader BRA.CC instructions without predicate (#3472)

* Fix decoding of block after BRA.CC instructions without predicate

* Shader cache version bump

Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs

@@ -21,7 +21,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
         private const ushort FileFormatVersionMajor = 1;
         private const ushort FileFormatVersionMinor = 1;
         private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor;
-        private const uint CodeGenVersion = 3478;
+        private const uint CodeGenVersion = 3472;
 
         private const string SharedTocFileName = "shared.toc";
         private const string SharedDataFileName = "shared.data";

Ryujinx.Graphics.Shader/Decoders/Block.cs

@@ -92,7 +92,11 @@ namespace Ryujinx.Graphics.Shader.Decoders
                 pushOpInfo.Consumers.Add(rightBlock, local);
             }
 
-            rightBlock.SyncTargets.Union(SyncTargets);
+            foreach ((ulong  key, SyncTarget value) in SyncTargets)
+            {
+                rightBlock.SyncTargets.Add(key, value);
+            }
+
             SyncTargets.Clear();
 
             // Move push ops.

Ryujinx.Graphics.Shader/Decoders/Decoder.cs

@@ -340,7 +340,7 @@ namespace Ryujinx.Graphics.Shader.Decoders
         {
             InstConditional condOp = new InstConditional(op.RawOpCode);
 
-            if (op.Name == InstName.Exit && condOp.Ccc != Ccc.T)
+            if ((op.Name == InstName.Bra || op.Name == InstName.Exit) && condOp.Ccc != Ccc.T)
             {
                 return false;
             }
@@ -672,6 +672,7 @@ namespace Ryujinx.Graphics.Shader.Decoders
                     // Make sure we found the correct address,
                     // the push and pop instruction types must match, so:
                     // - BRK can only consume addresses pushed by PBK.
+                    // - CONT can only consume addresses pushed by PCNT.
                     // - SYNC can only consume addresses pushed by SSY.
                     if (found)
                     {

Ryujinx.Graphics.Shader/Translation/Rewriter.cs

@@ -164,7 +164,7 @@ namespace Ryujinx.Graphics.Shader.Translation
 
             bool isBindless = (texOp.Flags & TextureFlags.Bindless) != 0;
 
-            bool isCoordNormalized = !isBindless && config.GpuAccessor.QueryTextureCoordNormalized(texOp.Handle, texOp.CbufSlot);
+            bool isCoordNormalized = isBindless || config.GpuAccessor.QueryTextureCoordNormalized(texOp.Handle, texOp.CbufSlot);
 
             if (!hasInvalidOffset && isCoordNormalized)
             {