summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authornamkazy <nam.kazt.91@gmail.com>2020-03-30 18:47:00 +0700
committernamkazy <nam.kazt.91@gmail.com>2020-03-30 18:47:00 +0700
commitc8f6d9effd32a61be435cc08310bd94d2597cc97 (patch)
treeaa96fe58f3f970d698abb8bd193d499b9a41e70e /src
parent972485ff18c9929faa07d1091634715e4c7f7eb4 (diff)
shader_decode: merge GlobalAtomicOp to AtomicOp
Diffstat (limited to 'src')
-rw-r--r--src/video_core/engines/shader_bytecode.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h
index 49dc5abe0..930b605af 100644
--- a/src/video_core/engines/shader_bytecode.h
+++ b/src/video_core/engines/shader_bytecode.h
@@ -231,18 +231,6 @@ enum class AtomicOp : u64 {
Or = 6,
Xor = 7,
Exch = 8,
-};
-
-enum class GlobalAtomicOp : u64 {
- Add = 0,
- Min = 1,
- Max = 2,
- Inc = 3,
- Dec = 4,
- And = 5,
- Or = 6,
- Xor = 7,
- Exch = 8,
SafeAdd = 10,
};
@@ -1001,7 +989,7 @@ union Instruction {
} stg;
union {
- BitField<52, 4, GlobalAtomicOp> operation;
+ BitField<52, 4, AtomicOp> operation;
BitField<49, 3, GlobalAtomicType> type;
BitField<28, 20, s64> offset;
} atom;