lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 13:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Follow up to c088c9186d - opcodes can shift by scalar or component-wise

Browse Source
This commit is contained in:
baldurk
2017-02-21 10:21:48 +00:00
parent 06af5ca71e
commit 6d428669d5
1 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/dxbc/dxbc_debug.cpp
+53 -17
View File
@@ -1521,13 +1521,6 @@ State State::GetNext(GlobalState &global, State quad[4]) const
break;
}
case OPCODE_ISHL:
s.SetDst(op.operands[0], op,
ShaderVariable("", srcOpers[0].value.i.x << (srcOpers[1].value.u.x & 0x1f),
srcOpers[0].value.i.y << (srcOpers[1].value.u.x & 0x1f),
srcOpers[0].value.i.z << (srcOpers[1].value.u.x & 0x1f),
srcOpers[0].value.i.w << (srcOpers[1].value.u.x & 0x1f)));
break;
case OPCODE_IBFE:
{
// bottom 5 bits
@@ -1617,20 +1610,63 @@ State State::GetNext(GlobalState &global, State quad[4]) const
s.SetDst(op.operands[0], op, dest);
break;
}
case OPCODE_ISHL:
{
uint32_t shifts[] = {
srcOpers[1].value.u.x & 0x1f, srcOpers[1].value.u.y & 0x1f, srcOpers[1].value.u.z & 0x1f,
srcOpers[1].value.u.w & 0x1f,
};
// if we were only given a single component, it's the form that shifts all components
// by the same amount
if(op.operands[2].numComponents == NUMCOMPS_1 ||
(op.operands[2].comps[2] < 4 && op.operands[2].comps[2] == 0xff))
shifts[3] = shifts[2] = shifts[1] = shifts[0];
s.SetDst(
op.operands[0], op,
ShaderVariable("", srcOpers[0].value.i.x << shifts[0], srcOpers[0].value.i.y << shifts[1],
srcOpers[0].value.i.z << shifts[2], srcOpers[0].value.i.w << shifts[3]));
break;
}
case OPCODE_USHR:
s.SetDst(op.operands[0], op,
ShaderVariable("", srcOpers[0].value.u.x >> (srcOpers[1].value.u.x & 0x1f),
srcOpers[0].value.u.y >> (srcOpers[1].value.u.x & 0x1f),
srcOpers[0].value.u.z >> (srcOpers[1].value.u.x & 0x1f),
srcOpers[0].value.u.w >> (srcOpers[1].value.u.x & 0x1f)));
{
uint32_t shifts[] = {
srcOpers[1].value.u.x & 0x1f, srcOpers[1].value.u.y & 0x1f, srcOpers[1].value.u.z & 0x1f,
srcOpers[1].value.u.w & 0x1f,
};
// if we were only given a single component, it's the form that shifts all components
// by the same amount
if(op.operands[2].numComponents == NUMCOMPS_1 ||
(op.operands[2].comps[2] < 4 && op.operands[2].comps[2] == 0xff))
shifts[3] = shifts[2] = shifts[1] = shifts[0];
s.SetDst(
op.operands[0], op,
ShaderVariable("", srcOpers[0].value.u.x >> shifts[0], srcOpers[0].value.u.y >> shifts[1],
srcOpers[0].value.u.z >> shifts[2], srcOpers[0].value.u.w >> shifts[3]));
break;
}
case OPCODE_ISHR:
s.SetDst(op.operands[0], op,
ShaderVariable("", srcOpers[0].value.i.x >> (srcOpers[1].value.u.x & 0x1f),
srcOpers[0].value.i.y >> (srcOpers[1].value.u.x & 0x1f),
srcOpers[0].value.i.z >> (srcOpers[1].value.u.x & 0x1f),
srcOpers[0].value.i.w >> (srcOpers[1].value.u.x & 0x1f)));
{
uint32_t shifts[] = {
srcOpers[1].value.u.x & 0x1f, srcOpers[1].value.u.y & 0x1f, srcOpers[1].value.u.z & 0x1f,
srcOpers[1].value.u.w & 0x1f,
};
// if we were only given a single component, it's the form that shifts all components
// by the same amount
if(op.operands[2].numComponents == NUMCOMPS_1 ||
(op.operands[2].comps[2] < 4 && op.operands[2].comps[2] == 0xff))
shifts[3] = shifts[2] = shifts[1] = shifts[0];
s.SetDst(
op.operands[0], op,
ShaderVariable("", srcOpers[0].value.i.x >> shifts[0], srcOpers[0].value.i.y >> shifts[1],
srcOpers[0].value.i.z >> shifts[2], srcOpers[0].value.i.w >> shifts[3]));
break;
}
case OPCODE_AND:
s.SetDst(op.operands[0], op, ShaderVariable("", srcOpers[0].value.i.x & srcOpers[1].value.i.x,
srcOpers[0].value.i.y & srcOpers[1].value.i.y,