mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-11-09 15:49:59 +00:00
shader_decode: merge GlobalAtomicOp to AtomicOp
This commit is contained in:
parent
972485ff18
commit
c8f6d9effd
1 changed files with 1 additions and 13 deletions
|
@ -231,18 +231,6 @@ enum class AtomicOp : u64 {
|
||||||
Or = 6,
|
Or = 6,
|
||||||
Xor = 7,
|
Xor = 7,
|
||||||
Exch = 8,
|
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,
|
SafeAdd = 10,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1001,7 +989,7 @@ union Instruction {
|
||||||
} stg;
|
} stg;
|
||||||
|
|
||||||
union {
|
union {
|
||||||
BitField<52, 4, GlobalAtomicOp> operation;
|
BitField<52, 4, AtomicOp> operation;
|
||||||
BitField<49, 3, GlobalAtomicType> type;
|
BitField<49, 3, GlobalAtomicType> type;
|
||||||
BitField<28, 20, s64> offset;
|
BitField<28, 20, s64> offset;
|
||||||
} atom;
|
} atom;
|
||||||
|
|
Loading…
Reference in a new issue