gl_shader_decompiler: Implement TEXS component mask.

src/core/hle/service/nvdrv/devices/nvhost_gpu.h

@@ -26,19 +26,11 @@ public:
 private:
     enum class IoctlCommand : u32_le {
         IocSetNVMAPfdCommand = 0x40044801,
-        IocAllocGPFIFOCommand = 0x40084805,
         IocSetClientDataCommand = 0x40084714,
         IocGetClientDataCommand = 0x80084715,
         IocZCullBind = 0xc010480b,
         IocSetErrorNotifierCommand = 0xC018480C,
         IocChannelSetPriorityCommand = 0x4004480D,
-        IocEnableCommand = 0x0000480E,
-        IocDisableCommand = 0x0000480F,
-        IocPreemptCommand = 0x00004810,
-        IocForceResetCommand = 0x00004811,
-        IocEventIdControlCommand = 0x40084812,
-        IocGetErrorNotificationCommand = 0xC0104817,
-        IocAllocGPFIFOExCommand = 0x40204818,
         IocAllocGPFIFOEx2Command = 0xC020481A,
         IocAllocObjCtxCommand = 0xC0104809,
         IocChannelGetWaitbaseCommand = 0xC0080003,
@@ -64,12 +56,6 @@ private:
     };
     static_assert(sizeof(IoctlChannelSetTimeout) == 4, "IoctlChannelSetTimeout is incorrect size");
 
-    struct IoctlAllocGPFIFO {
-        u32_le num_entries;
-        u32_le flags;
-    };
-    static_assert(sizeof(IoctlAllocGPFIFO) == 8, "IoctlAllocGPFIFO is incorrect size");
-
     struct IoctlClientData {
         u64_le data;
     };
@@ -90,45 +76,12 @@ private:
     };
     static_assert(sizeof(IoctlSetErrorNotifier) == 24, "IoctlSetErrorNotifier is incorrect size");
 
-    struct IoctlChannelSetPriority {
-        u32_le priority;
-    };
-    static_assert(sizeof(IoctlChannelSetPriority) == 4,
-                  "IoctlChannelSetPriority is incorrect size");
-
-    struct IoctlEventIdControl {
-        u32_le cmd; // 0=disable, 1=enable, 2=clear
-        u32_le id;
-    };
-    static_assert(sizeof(IoctlEventIdControl) == 8, "IoctlEventIdControl is incorrect size");
-
-    struct IoctlGetErrorNotification {
-        u64_le timestamp;
-        u32_le info32;
-        u16_le info16;
-        u16_le status; // always 0xFFFF
-    };
-    static_assert(sizeof(IoctlGetErrorNotification) == 16,
-                  "IoctlGetErrorNotification is incorrect size");
-
     struct IoctlFence {
         u32_le id;
         u32_le value;
     };
     static_assert(sizeof(IoctlFence) == 8, "IoctlFence is incorrect size");
 
-    struct IoctlAllocGpfifoEx {
-        u32_le num_entries;
-        u32_le flags;
-        u32_le unk0;
-        u32_le unk1;
-        u32_le unk2;
-        u32_le unk3;
-        u32_le unk4;
-        u32_le unk5;
-    };
-    static_assert(sizeof(IoctlAllocGpfifoEx) == 32, "IoctlAllocGpfifoEx is incorrect size");
-
     struct IoctlAllocGpfifoEx2 {
         u32_le num_entries;   // in
         u32_le flags;         // in

src/video_core/engines/shader_bytecode.h

@@ -270,8 +270,22 @@ union Instruction {
     } tex;
 
     union {
-        // TODO(bunnei): This is just a guess, needs to be verified
-        BitField<52, 1, u64> enable_g_component;
+        BitField<50, 3, u64> component_mask_selector;
+        BitField<28, 8, Register> gpr28;
+
+        bool HasTwoDestinations() const {
+            return gpr28.Value() != Register::ZeroIndex;
+        }
+
+        bool IsComponentEnabled(size_t component) const {
+            static constexpr std::array<size_t, 5> one_dest_mask{0x1, 0x2, 0x4, 0x8, 0x3};
+            static constexpr std::array<size_t, 5> two_dest_mask{0x7, 0xb, 0xd, 0xe, 0xf};
+            const auto& mask{HasTwoDestinations() ? two_dest_mask : one_dest_mask};
+
+            ASSERT(component_mask_selector < mask.size());
+
+            return ((1 << component) & mask[component_mask_selector]) != 0;
+        }
     } texs;
 
     BitField<61, 1, u64> is_b_imm;

src/video_core/renderer_opengl/gl_shader_decompiler.cpp

@@ -938,18 +938,21 @@ private:
                 // TEXS has two destination registers. RG goes into gpr0+0 and gpr0+1, and BA goes
                 // into gpr28+0 and gpr28+1
                 size_t offset{};
+
                 for (const auto& dest : {instr.gpr0.Value(), instr.gpr28.Value()}) {
                     for (unsigned elem = 0; elem < 2; ++elem) {
-                        if (dest + elem >= Register::ZeroIndex) {
-                            // Skip invalid register values
-                            break;
+                        if (!instr.texs.IsComponentEnabled(elem)) {
+                            // Skip disabled components
+                            continue;
                         }
                         regs.SetRegisterToFloat(dest, elem + offset, texture, 1, 4, false, elem);
-                        if (!instr.texs.enable_g_component) {
-                            // Skip the second component
-                            break;
-                        }
                     }
+
+                    if (!instr.texs.HasTwoDestinations()) {
+                        // Skip the second destination
+                        break;
+                    }
+
                     offset += 2;
                 }
                 --shader.scope;