backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxbc] Fixed type of atomic pointers into typed UAVs

Browse Source 
Should fix a crash in the Nvidia driver.
This commit is contained in:
Philip Rebohle 2018-03-30 17:31:48 +02:00
parent 05e0f3d52d
commit 47e78d0a95
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dxbc/dxbc_compiler.cpp
View File

@ -1989,8 +1989,9 @@ namespace dxvk {
std::array<DxbcRegisterValue, 2> src; std::array<DxbcRegisterValue, 2> src;
for (uint32_t i = 1; i < ins.srcCount; i++) { for (uint32_t i = 1; i < ins.srcCount; i++) {
src[i - 1] = emitRegisterLoad(ins.src[i], src[i - 1] = emitRegisterBitcast(
DxbcRegMask(true, false, false, false)); emitRegisterLoad(ins.src[i], DxbcRegMask(true, false, false, false)),
pointer.type.ctype);
} }
// Define memory scope and semantics based on the operands // Define memory scope and semantics based on the operands
@ -2007,9 +2008,8 @@ namespace dxvk {
// Perform the atomic operation on the given pointer // Perform the atomic operation on the given pointer
DxbcRegisterValue value; DxbcRegisterValue value;
value.type.ctype = ins.dst[0].dataType; value.type = pointer.type;
value.type.ccount = 1; value.id = 0;
value.id = 0;
// The result type, which is a scalar integer // The result type, which is a scalar integer
const uint32_t typeId = getVectorTypeId(value.type); const uint32_t typeId = getVectorTypeId(value.type);
@ -4286,7 +4286,7 @@ namespace dxvk {
// Compute the actual pointer // Compute the actual pointer
DxbcRegisterPointer result; DxbcRegisterPointer result;
result.type.ctype = operand.dataType; result.type.ctype = resourceInfo.stype;
result.type.ccount = 1; result.type.ccount = 1;
result.id = isUav result.id = isUav
? m_module.opImageTexelPointer( ? m_module.opImageTexelPointer(