liberodark/eden
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[maxwell] fix ordering of sizes for atomicops (#2778)

Browse source 
S64 goes after F16x2FTZRN
Signed-off-by: lizzie <lizzie@eden-emu.dev>

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2778
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Reviewed-by: crueter <crueter@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie 2025-10-22 04:55:27 +02:00 • committed by crueter
parent 87cacbeed4
commit 1b1ab551a9
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/shader_recompiler/frontend/maxwell/translate/impl/surface_atomic_operations.cpp
View file

@ -12,21 +12,23 @@
namespace Shader::Maxwell { namespace Shader::Maxwell {
namespace { namespace {
enum class Type : u64 { enum class Type : u64 {
_1D, _1D = 0,
BUFFER_1D, _1D_BUFFER = 1,
ARRAY_1D, _1D_ARRAY = 2,
_2D, _2D = 3,
ARRAY_2D, _2D_ARRAY = 4,
_3D, _3D = 5,
_UNK6 = 6,
_UNK7 = 7,
}; };
enum class Size : u64 { enum class Size : u64 {
U32, U32,
S32, S32,
U64, U64,
S64,
F32FTZRN, F32FTZRN,
F16x2FTZRN, F16x2FTZRN,
S64,
SD32, SD32,
SD64, SD64,
}; };
@ -53,18 +55,19 @@ TextureType GetType(Type type) {
switch (type) { switch (type) {
case Type::_1D: case Type::_1D:
return TextureType::Color1D; return TextureType::Color1D;
case Type::BUFFER_1D: case Type::_1D_BUFFER:
return TextureType::Buffer; return TextureType::Buffer;
case Type::ARRAY_1D: case Type::_1D_ARRAY:
return TextureType::ColorArray1D; return TextureType::ColorArray1D;
case Type::_2D: case Type::_2D:
return TextureType::Color2D; return TextureType::Color2D;
case Type::ARRAY_2D: case Type::_2D_ARRAY:
return TextureType::ColorArray2D; return TextureType::ColorArray2D;
case Type::_3D: case Type::_3D:
return TextureType::Color3D; return TextureType::Color3D;
default:
throw NotImplementedException("Invalid type {}", type);
} }
throw NotImplementedException("Invalid type {}", type);
} }
IR::Value MakeCoords(TranslatorVisitor& v, IR::Reg reg, Type type) { IR::Value MakeCoords(TranslatorVisitor& v, IR::Reg reg, Type type) {
@ -73,7 +76,7 @@ IR::Value MakeCoords(TranslatorVisitor& v, IR::Reg reg, Type type) {
}}; }};
switch (type) { switch (type) {
case Type::_1D: case Type::_1D:
case Type::BUFFER_1D: case Type::_1D_BUFFER:
return v.X(reg); return v.X(reg);
case Type::ARRAY_1D: case Type::ARRAY_1D:
return v.ir.CompositeConstruct(v.X(reg), array(1)); return v.ir.CompositeConstruct(v.X(reg), array(1));
@ -84,9 +87,8 @@ IR::Value MakeCoords(TranslatorVisitor& v, IR::Reg reg, Type type) {
case Type::_3D: case Type::_3D:
return v.ir.CompositeConstruct(v.X(reg), v.X(reg + 1), v.X(reg + 2)); return v.ir.CompositeConstruct(v.X(reg), v.X(reg + 1), v.X(reg + 2));
default: default:
break; throw NotImplementedException("Invalid type {}", type);
} }
throw NotImplementedException("Invalid type {}", type);
} }
IR::Value ApplyAtomicOp(IR::IREmitter& ir, const IR::U32& handle, const IR::Value& coords, IR::Value ApplyAtomicOp(IR::IREmitter& ir, const IR::U32& handle, const IR::Value& coords,