fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DXBC] Unbreak signed integer vfetch + don't multiply by 1 in normalization

Browse Source
This commit is contained in:
Triang3l
2020-05-23 19:04:42 +03:00
parent 7f2d9ca929
commit 04ca28c902
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/xenia/gpu/dxbc_shader_translator_fetch.cc
View File

@@ -302,36 +302,48 @@ void DxbcShaderTranslator::ProcessVertexFetchInstruction(
DxbcSrc::R(system_temp_result_, packed_swizzle)); DxbcSrc::R(system_temp_result_, packed_swizzle));
DxbcOpIToF(result_unpacked_dest, result_src); DxbcOpIToF(result_unpacked_dest, result_src);
if (!instr.attributes.is_integer) { if (!instr.attributes.is_integer) {
float packed_scales[4]; float packed_scales[4] = {};
uint32_t packed_scales_mask = 0b0000;
for (uint32_t i = 0; i < 4; ++i) { for (uint32_t i = 0; i < 4; ++i) {
if (packed_widths[i]) { if (!(used_format_components & (1 << i))) {
continue;
}
if (packed_widths[i] > 2) {
packed_scales[i] = packed_scales[i] =
1.0f / float((uint32_t(1) << (packed_widths[i] - 1)) - 1); 1.0f / float((uint32_t(1) << (packed_widths[i] - 1)) - 1);
} else { packed_scales_mask |= 1 << i;
packed_scales[i] = 0.0f;
} }
} }
DxbcOpMul(result_unpacked_dest, result_src, DxbcSrc::LP(packed_scales)); if (packed_scales_mask) {
DxbcOpMul(DxbcDest::R(system_temp_result_, packed_scales_mask),
result_src, DxbcSrc::LP(packed_scales));
}
// Treat both -(2^(n-1)) and -(2^(n-1)-1) as -1, according to Direct3D
// snorm to float conversion rules.
DxbcOpMax(result_unpacked_dest, result_src, DxbcSrc::LF(-1.0f));
} }
// Treat both -(2^(n-1)) and -(2^(n-1)-1) as -1, according to Direct3D
// snorm to float conversion rules.
DxbcOpMax(result_unpacked_dest, result_src, DxbcSrc::LF(-1.0f));
} else { } else {
DxbcOpUBFE(result_unpacked_dest, DxbcSrc::LP(packed_widths), DxbcOpUBFE(result_unpacked_dest, DxbcSrc::LP(packed_widths),
DxbcSrc::LP(packed_offsets), DxbcSrc::LP(packed_offsets),
DxbcSrc::R(system_temp_result_, packed_swizzle)); DxbcSrc::R(system_temp_result_, packed_swizzle));
DxbcOpUToF(result_unpacked_dest, result_src); DxbcOpUToF(result_unpacked_dest, result_src);
if (!instr.attributes.is_integer) { if (!instr.attributes.is_integer) {
float packed_scales[4]; float packed_scales[4] = {};
uint32_t packed_scales_mask = 0b0000;
for (uint32_t i = 0; i < 4; ++i) { for (uint32_t i = 0; i < 4; ++i) {
if (packed_widths[i]) { if (!(used_format_components & (1 << i))) {
continue;
}
if (packed_widths[i] > 1) {
packed_scales[i] = packed_scales[i] =
1.0f / float((uint32_t(1) << packed_widths[i]) - 1); 1.0f / float((uint32_t(1) << packed_widths[i]) - 1);
} else { packed_scales_mask |= 1 << i;
packed_scales[i] = 0.0f;
} }
} }
DxbcOpMul(result_unpacked_dest, result_src, DxbcSrc::LP(packed_scales)); if (packed_scales_mask) {
DxbcOpMul(DxbcDest::R(system_temp_result_, packed_scales_mask),
result_src, DxbcSrc::LP(packed_scales));
}
} }
} }
} else { } else {