mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[spirv] Add support for memory operands on load/store operations

This commit is contained in:
Philip Rebohle 2022-09-09 01:14:03 +02:00
parent d564be68d6
commit 0b891a93b2
2 changed files with 77 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/spirv/spirv_module.cpp
View File

@ -2994,12 +2994,22 @@ namespace dxvk {
uint32_t SpirvModule::opLoad(
uint32_t typeId,
uint32_t pointerId) {
return opLoad(typeId, pointerId, SpirvMemoryOperands());
}
uint32_t SpirvModule::opLoad(
uint32_t typeId,
uint32_t pointerId,
const SpirvMemoryOperands& operands) {
uint32_t resultId = this->allocateId();
m_code.putIns (spv::OpLoad, 4);
m_code.putIns (spv::OpLoad, 4 + getMemoryOperandWordCount(operands));
m_code.putWord(typeId);
m_code.putWord(resultId);
m_code.putWord(pointerId);
putMemoryOperands(operands);
return resultId;
}
@ -3007,12 +3017,22 @@ namespace dxvk {
void SpirvModule::opStore(
uint32_t pointerId,
uint32_t valueId) {
m_code.putIns (spv::OpStore, 3);
opStore(pointerId, valueId, SpirvMemoryOperands());
}
void SpirvModule::opStore(
uint32_t pointerId,
uint32_t valueId,
const SpirvMemoryOperands& operands) {
m_code.putIns (spv::OpStore, 3 + getMemoryOperandWordCount(operands));
m_code.putWord(pointerId);
m_code.putWord(valueId);
putMemoryOperands(operands);
}
uint32_t SpirvModule::opInterpolateAtCentroid(
uint32_t resultType,
uint32_t interpolant) {
@ -3753,6 +3773,34 @@ namespace dxvk {
}
uint32_t SpirvModule::getMemoryOperandWordCount(
const SpirvMemoryOperands& op) const {
const uint32_t result
= ((op.flags & spv::MemoryAccessAlignedMask) ? 1 : 0)
+ ((op.flags & spv::MemoryAccessMakePointerAvailableMask) ? 1 : 0)
+ ((op.flags & spv::MemoryAccessMakePointerVisibleMask) ? 1 : 0);
return op.flags ? result + 1 : 0;
}
void SpirvModule::putMemoryOperands(
const SpirvMemoryOperands& op) {
if (op.flags) {
m_code.putWord(op.flags);
if (op.flags & spv::MemoryAccessAlignedMask)
m_code.putWord(op.alignment);
if (op.flags & spv::MemoryAccessMakePointerAvailableMask)
m_code.putWord(op.makeAvailable);
if (op.flags & spv::MemoryAccessMakePointerVisibleMask)
m_code.putWord(op.makeVisible);
}
}
uint32_t SpirvModule::getImageOperandWordCount(const SpirvImageOperands& op) const {
// Each flag may add one or more operands
const uint32_t result

27
src/spirv/spirv_module.h
View File

@ -15,6 +15,13 @@ namespace dxvk {
uint32_t literal = 0;
uint32_t labelId = 0;
};
struct SpirvMemoryOperands {
uint32_t flags = 0;
uint32_t alignment = 0;
uint32_t makeAvailable = 0;
uint32_t makeVisible = 0;
};
struct SpirvImageOperands {
uint32_t flags = 0;
@ -1032,11 +1039,21 @@ namespace dxvk {
uint32_t opLoad(
uint32_t typeId,
uint32_t pointerId);
uint32_t opLoad(
uint32_t typeId,
uint32_t pointerId,
const SpirvMemoryOperands& operands);
void opStore(
uint32_t pointerId,
uint32_t valueId);
void opStore(
uint32_t pointerId,
uint32_t valueId,
const SpirvMemoryOperands& operands);
uint32_t opInterpolateAtCentroid(
uint32_t resultType,
uint32_t interpolant);
@ -1281,6 +1298,12 @@ namespace dxvk {
void instImportGlsl450();
uint32_t getMemoryOperandWordCount(
const SpirvMemoryOperands& op) const;
void putMemoryOperands(
const SpirvMemoryOperands& op);
uint32_t getImageOperandWordCount(
const SpirvImageOperands& op) const;