summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar namkazy2020-03-30 18:47:00 +0700
committerGravatar namkazy2020-03-30 18:47:00 +0700
commitc8f6d9effd32a61be435cc08310bd94d2597cc97 (patch)
treeaa96fe58f3f970d698abb8bd193d499b9a41e70e /src
parentshader_decode: implement ATOM operation for S32 and U32 (diff)
downloadyuzu-c8f6d9effd32a61be435cc08310bd94d2597cc97.tar.gz
yuzu-c8f6d9effd32a61be435cc08310bd94d2597cc97.tar.xz
yuzu-c8f6d9effd32a61be435cc08310bd94d2597cc97.zip
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 {
231 Or = 6, 231 Or = 6,
232 Xor = 7, 232 Xor = 7,
233 Exch = 8, 233 Exch = 8,
234};
235
236enum class GlobalAtomicOp : u64 {
237 Add = 0,
238 Min = 1,
239 Max = 2,
240 Inc = 3,
241 Dec = 4,
242 And = 5,
243 Or = 6,
244 Xor = 7,
245 Exch = 8,
246 SafeAdd = 10, 234 SafeAdd = 10,
247}; 235};
248 236
@@ -1001,7 +989,7 @@ union Instruction {
1001 } stg; 989 } stg;
1002 990
1003 union { 991 union {
1004 BitField<52, 4, GlobalAtomicOp> operation; 992 BitField<52, 4, AtomicOp> operation;
1005 BitField<49, 3, GlobalAtomicType> type; 993 BitField<49, 3, GlobalAtomicType> type;
1006 BitField<28, 20, s64> offset; 994 BitField<28, 20, s64> offset;
1007 } atom; 995 } atom;