mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-31 14:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

all is broken ig....

Browse Source
This commit is contained in:
mahmoud radwan 2025-04-27 00:35:52 +03:00
parent ba36139bc7
commit 9e60665c73
5 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/shader_recompiler/ir/passes/lower_buffer_format_to_raw.cpp
View File

@ -202,7 +202,7 @@ static void LowerBufferFormatInst(IR::Block& block, IR::Inst& inst, Info& info)
.data_format = data_format, .data_format = data_format,
.num_format = num_format, .num_format = num_format,
.swizzle = is_inst_typed ? AmdGpu::IdentityMapping : buffer.DstSelect(), .swizzle = is_inst_typed ? AmdGpu::IdentityMapping : buffer.DstSelect(),
.num_conversion = AmdGpu::MapNumberConversion(num_format), .num_conversion = AmdGpu::MapNumberConversion(num_format, data_format),
.num_components = AmdGpu::NumComponents(data_format), .num_components = AmdGpu::NumComponents(data_format),
}; };

20
src/shader_recompiler/ir/reinterpret.h
View File

@ -34,10 +34,16 @@ inline F32 ApplyReadNumberConversion(IREmitter& ir, const F32& value,
case AmdGpu::NumberConversion::UnormToUbnorm: case AmdGpu::NumberConversion::UnormToUbnorm:
// Convert 0...1 to -1...1 // Convert 0...1 to -1...1
return ir.FPSub(ir.FPMul(value, ir.Imm32(2.f)), ir.Imm32(1.f)); return ir.FPSub(ir.FPMul(value, ir.Imm32(2.f)), ir.Imm32(1.f));
case AmdGpu::NumberConversion::SintToSnormNz: { case AmdGpu::NumberConversion::Sint8ToSnormNz: {
const IR::U32 additon = ir.IAdd(ir.IMul(ir.BitCast<U32>(value), ir.Imm32(2)), ir.Imm32(1)); const IR::U32 additon = ir.IAdd(ir.IMul(ir.BitCast<U32>(value), ir.Imm32(2)), ir.Imm32(1));
const IR::F32 left = ir.ConvertSToF(32, 32, additon); const IR::F32 left = ir.ConvertSToF(32, 32, additon);
const IR::F32 max = ir.Imm32(float(std::numeric_limits<u32>::max())); const IR::F32 max = ir.Imm32(float(std::numeric_limits<u8>::max()));
return ir.FPDiv(left, max);
}
case AmdGpu::NumberConversion::Sint16ToSnormNz: {
const IR::U32 additon = ir.IAdd(ir.IMul(ir.BitCast<U32>(value), ir.Imm32(2)), ir.Imm32(1));
const IR::F32 left = ir.ConvertSToF(32, 32, additon);
const IR::F32 max = ir.Imm32(float(std::numeric_limits<u16>::max()));
return ir.FPDiv(left, max); return ir.FPDiv(left, max);
} }
default: default:
@ -72,12 +78,18 @@ inline F32 ApplyWriteNumberConversion(IREmitter& ir, const F32& value,
case AmdGpu::NumberConversion::UnormToUbnorm: case AmdGpu::NumberConversion::UnormToUbnorm:
// Convert -1...1 to 0...1 // Convert -1...1 to 0...1
return ir.FPDiv(ir.FPAdd(value, ir.Imm32(1.f)), ir.Imm32(2.f)); return ir.FPDiv(ir.FPAdd(value, ir.Imm32(1.f)), ir.Imm32(2.f));
case AmdGpu::NumberConversion::SintToSnormNz: { case AmdGpu::NumberConversion::Sint8ToSnormNz: {
const IR::F32 max = ir.Imm32(float(std::numeric_limits<u32>::max())); const IR::F32 max = ir.Imm32(float(std::numeric_limits<u8>::max()));
const IR::F32 mul = ir.FPMul(ir.FPClamp(value, ir.Imm32(-1.f), ir.Imm32(1.f)), max); const IR::F32 mul = ir.FPMul(ir.FPClamp(value, ir.Imm32(-1.f), ir.Imm32(1.f)), max);
const IR::F32 left = ir.FPSub(mul, ir.Imm32(1.f)); const IR::F32 left = ir.FPSub(mul, ir.Imm32(1.f));
return ir.BitCast<F32>(U32{ir.FPDiv(left, ir.Imm32(2.f))}); return ir.BitCast<F32>(U32{ir.FPDiv(left, ir.Imm32(2.f))});
} }
case AmdGpu::NumberConversion::Sint16ToSnormNz: {
const IR::F32 max = ir.Imm32(float(std::numeric_limits<u16>::max()));
const IR::F32 mul = ir.FPMul(ir.FPClamp(value, ir.Imm32(-1.f), ir.Imm32(1.f)), max);
const IR::F32 left = ir.FPSub(mul, ir.Imm32(1.f));
return ir.BitCast<F32>(U32{ir.FPDiv(left, ir.Imm32(2.f))});
}
default: default:
UNREACHABLE(); UNREACHABLE();
} }

2
src/video_core/amdgpu/liverpool.h
View File

@ -932,7 +932,7 @@ struct Liverpool {
} }
[[nodiscard]] NumberConversion GetNumberConversion() const { [[nodiscard]] NumberConversion GetNumberConversion() const {
return MapNumberConversion(info.number_type); return MapNumberConversion(info.number_type, info.format);
} }
[[nodiscard]] CompMapping Swizzle() const { [[nodiscard]] CompMapping Swizzle() const {

4
src/video_core/amdgpu/resource.h
View File

@ -68,7 +68,7 @@ struct Buffer {
} }
NumberConversion GetNumberConversion() const noexcept { NumberConversion GetNumberConversion() const noexcept {
return MapNumberConversion(NumberFormat(num_format)); return MapNumberConversion(NumberFormat(num_format), DataFormat(data_format));
} }
u32 GetStride() const noexcept { u32 GetStride() const noexcept {
@ -292,7 +292,7 @@ struct Image {
} }
NumberConversion GetNumberConversion() const noexcept { NumberConversion GetNumberConversion() const noexcept {
return MapNumberConversion(NumberFormat(num_format)); return MapNumberConversion(NumberFormat(num_format), DataFormat(data_format));
} }
TilingMode GetTilingMode() const { TilingMode GetTilingMode() const {

24
src/video_core/amdgpu/types.h
View File

@ -197,7 +197,8 @@ enum class NumberConversion : u32 {
UintToUscaled = 1, UintToUscaled = 1,
SintToSscaled = 2, SintToSscaled = 2,
UnormToUbnorm = 3, UnormToUbnorm = 3,
SintToSnormNz = 4, Sint16ToSnormNz = 5,
Sint8ToSnormNz = 6,
}; };
struct CompMapping { struct CompMapping {
@ -338,16 +339,29 @@ inline CompMapping RemapSwizzle(const DataFormat format, const CompMapping swizz
} }
} }
inline NumberConversion MapNumberConversion(const NumberFormat format) { inline NumberConversion MapNumberConversion(const NumberFormat num_fmt, const DataFormat data_fmt) {
switch (format) { switch (num_fmt) {
case NumberFormat::Uscaled: case NumberFormat::Uscaled:
return NumberConversion::UintToUscaled; return NumberConversion::UintToUscaled;
case NumberFormat::Sscaled: case NumberFormat::Sscaled:
return NumberConversion::SintToSscaled; return NumberConversion::SintToSscaled;
case NumberFormat::Ubnorm: case NumberFormat::Ubnorm:
return NumberConversion::UnormToUbnorm; return NumberConversion::UnormToUbnorm;
case NumberFormat::SnormNz: case NumberFormat::SnormNz: {
return NumberConversion::SintToSnormNz; switch (data_fmt) {
case DataFormat::Format8:
case DataFormat::Format8_8:
case DataFormat::Format8_8_8_8:
return NumberConversion::Sint8ToSnormNz;
case DataFormat::Format16:
case DataFormat::Format16_16:
case DataFormat::Format16_16_16_16:
return NumberConversion::Sint16ToSnormNz;
default:
UNREACHABLE_MSG("data_fmt = {}", u32(data_fmt));
break;
}
}
default: default:
return NumberConversion::None; return NumberConversion::None;
} }