rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-28 07:54:14 +01:00
Code Issues Projects Releases Wiki Activity

[dxbc] Apply Modulo 31 to bit counts and offsets (shr/shl/bfe/bfi)

Browse Source 
Assassin's Creed Syndicate relies on correct behaviour.
This commit is contained in:
Philip Rebohle 2018-09-03 01:01:44 +02:00
parent ae62499e3a
commit 9520c9b1b8
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/dxbc/dxbc_compiler.cpp
View File

@ -1961,6 +1961,9 @@ namespace dxvk {
DxbcRegisterValue shiftReg = emitRegisterLoad(ins.src[0], ins.dst[0].mask); DxbcRegisterValue shiftReg = emitRegisterLoad(ins.src[0], ins.dst[0].mask);
DxbcRegisterValue countReg = emitRegisterLoad(ins.src[1], ins.dst[0].mask); DxbcRegisterValue countReg = emitRegisterLoad(ins.src[1], ins.dst[0].mask);
if (ins.src[1].type != DxbcOperandType::Imm32)
countReg = emitRegisterMaskBits(countReg, 0x1F);
if (countReg.type.ccount == 1) if (countReg.type.ccount == 1)
countReg = emitRegisterExtend(countReg, shiftReg.type.ccount); countReg = emitRegisterExtend(countReg, shiftReg.type.ccount);
@ -2351,8 +2354,14 @@ namespace dxvk {
// (src2) Register to extract bits from // (src2) Register to extract bits from
const bool isSigned = ins.op == DxbcOpcode::IBfe; const bool isSigned = ins.op == DxbcOpcode::IBfe;
const DxbcRegisterValue bitCnt = emitRegisterLoad(ins.src[0], ins.dst[0].mask); DxbcRegisterValue bitCnt = emitRegisterLoad(ins.src[0], ins.dst[0].mask);
const DxbcRegisterValue bitOfs = emitRegisterLoad(ins.src[1], ins.dst[0].mask); DxbcRegisterValue bitOfs = emitRegisterLoad(ins.src[1], ins.dst[0].mask);
if (ins.src[0].type != DxbcOperandType::Imm32)
bitCnt = emitRegisterMaskBits(bitCnt, 0x1F);
if (ins.src[1].type != DxbcOperandType::Imm32)
bitOfs = emitRegisterMaskBits(bitOfs, 0x1F);
const DxbcRegisterValue src = emitRegisterLoad(ins.src[2], ins.dst[0].mask); const DxbcRegisterValue src = emitRegisterLoad(ins.src[2], ins.dst[0].mask);
@ -2389,8 +2398,14 @@ namespace dxvk {
// (src1) Offset of the bits to extract // (src1) Offset of the bits to extract
// (src2) Register to take bits from // (src2) Register to take bits from
// (src3) Register to replace bits in // (src3) Register to replace bits in
const DxbcRegisterValue bitCnt = emitRegisterLoad(ins.src[0], ins.dst[0].mask); DxbcRegisterValue bitCnt = emitRegisterLoad(ins.src[0], ins.dst[0].mask);
const DxbcRegisterValue bitOfs = emitRegisterLoad(ins.src[1], ins.dst[0].mask); DxbcRegisterValue bitOfs = emitRegisterLoad(ins.src[1], ins.dst[0].mask);
if (ins.src[0].type != DxbcOperandType::Imm32)
bitCnt = emitRegisterMaskBits(bitCnt, 0x1F);
if (ins.src[1].type != DxbcOperandType::Imm32)
bitOfs = emitRegisterMaskBits(bitOfs, 0x1F);
const DxbcRegisterValue insert = emitRegisterLoad(ins.src[2], ins.dst[0].mask); const DxbcRegisterValue insert = emitRegisterLoad(ins.src[2], ins.dst[0].mask);
const DxbcRegisterValue base = emitRegisterLoad(ins.src[3], ins.dst[0].mask); const DxbcRegisterValue base = emitRegisterLoad(ins.src[3], ins.dst[0].mask);
@ -4164,6 +4179,21 @@ namespace dxvk {
} }
DxbcRegisterValue DxbcCompiler::emitRegisterMaskBits(
DxbcRegisterValue value,
uint32_t mask) {
DxbcRegisterValue maskVector = emitBuildConstVecu32(
mask, mask, mask, mask, DxbcRegMask::firstN(value.type.ccount));
DxbcRegisterValue result;
result.type = value.type;
result.id = m_module.opBitwiseAnd(
getVectorTypeId(result.type),
value.id, maskVector.id);
return result;
}
DxbcRegisterValue DxbcCompiler::emitSrcOperandModifiers( DxbcRegisterValue DxbcCompiler::emitSrcOperandModifiers(
DxbcRegisterValue value, DxbcRegisterValue value,
DxbcRegModifiers modifiers) { DxbcRegModifiers modifiers) {

4
src/dxbc/dxbc_compiler.h
View File

@ -822,6 +822,10 @@ namespace dxvk {
DxbcRegisterValue value, DxbcRegisterValue value,
DxbcZeroTest test); DxbcZeroTest test);
DxbcRegisterValue emitRegisterMaskBits(
DxbcRegisterValue value,
uint32_t mask);
DxbcRegisterValue emitSrcOperandModifiers( DxbcRegisterValue emitSrcOperandModifiers(
DxbcRegisterValue value, DxbcRegisterValue value,
DxbcRegModifiers modifiers); DxbcRegModifiers modifiers);