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] Implement hack to treat multisampled textures as normal textures

Browse Source
This commit is contained in:
Philip Rebohle 2021-07-02 04:36:50 +02:00
parent 8b6ac527b4
commit e379f472f6
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/dxbc/dxbc_compiler.cpp
View File

@ -3376,8 +3376,16 @@ namespace dxvk {
// The LOD is not present when reading from // The LOD is not present when reading from
// a buffer or from a multisample texture. // a buffer or from a multisample texture.
if (texture.imageInfo.dim != spv::DimBuffer && texture.imageInfo.ms == 0) { if (texture.imageInfo.dim != spv::DimBuffer && texture.imageInfo.ms == 0) {
DxbcRegisterValue imageLod = emitRegisterExtract( DxbcRegisterValue imageLod;
address, DxbcRegMask(false, false, false, true));
if (ins.op != DxbcOpcode::LdMs) {
imageLod = emitRegisterExtract(
address, DxbcRegMask(false, false, false, true));
} else {
// If we force-disabled MSAA, fetch from LOD 0
imageLod.type = { DxbcScalarType::Uint32, 1 };
imageLod.id = m_module.constu32(0);
}
imageOperands.flags |= spv::ImageOperandsLodMask; imageOperands.flags |= spv::ImageOperandsLodMask;
imageOperands.sLod = imageLod.id; imageOperands.sLod = imageLod.id;
@ -5366,9 +5374,15 @@ namespace dxvk {
DxbcRegisterValue result; DxbcRegisterValue result;
result.type.ctype = DxbcScalarType::Uint32; result.type.ctype = DxbcScalarType::Uint32;
result.type.ccount = 1; result.type.ccount = 1;
result.id = m_module.opImageQuerySamples(
getVectorTypeId(result.type), if (info.image.ms) {
m_module.opLoad(info.typeId, info.varId)); result.id = m_module.opImageQuerySamples(
getVectorTypeId(result.type),
m_module.opLoad(info.typeId, info.varId));
} else {
// OpImageQuerySamples requires MSAA images
result.id = m_module.constu32(1);
}
// Report a sample count of 0 for unbound images // Report a sample count of 0 for unbound images
result.id = m_module.opSelect(getVectorTypeId(result.type), result.id = m_module.opSelect(getVectorTypeId(result.type),
@ -7724,15 +7738,17 @@ namespace dxvk {
DxbcImageInfo DxbcCompiler::getResourceType( DxbcImageInfo DxbcCompiler::getResourceType(
DxbcResourceDim resourceType, DxbcResourceDim resourceType,
bool isUav) const { bool isUav) const {
DxbcImageInfo typeInfo = [resourceType, isUav] () -> DxbcImageInfo { uint32_t ms = m_moduleInfo.options.disableMsaa ? 0 : 1;
DxbcImageInfo typeInfo = [resourceType, isUav, ms] () -> DxbcImageInfo {
switch (resourceType) { switch (resourceType) {
case DxbcResourceDim::Buffer: return { spv::DimBuffer, 0, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_MAX_ENUM }; case DxbcResourceDim::Buffer: return { spv::DimBuffer, 0, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_MAX_ENUM };
case DxbcResourceDim::Texture1D: return { spv::Dim1D, 0, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_1D }; case DxbcResourceDim::Texture1D: return { spv::Dim1D, 0, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_1D };
case DxbcResourceDim::Texture1DArr: return { spv::Dim1D, 1, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_1D_ARRAY }; case DxbcResourceDim::Texture1DArr: return { spv::Dim1D, 1, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_1D_ARRAY };
case DxbcResourceDim::Texture2D: return { spv::Dim2D, 0, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_2D }; case DxbcResourceDim::Texture2D: return { spv::Dim2D, 0, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_2D };
case DxbcResourceDim::Texture2DArr: return { spv::Dim2D, 1, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_2D_ARRAY }; case DxbcResourceDim::Texture2DArr: return { spv::Dim2D, 1, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_2D_ARRAY };
case DxbcResourceDim::Texture2DMs: return { spv::Dim2D, 0, 1, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_2D }; case DxbcResourceDim::Texture2DMs: return { spv::Dim2D, 0, ms,isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_2D };
case DxbcResourceDim::Texture2DMsArr: return { spv::Dim2D, 1, 1, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_2D_ARRAY }; case DxbcResourceDim::Texture2DMsArr: return { spv::Dim2D, 1, ms,isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_2D_ARRAY };
case DxbcResourceDim::Texture3D: return { spv::Dim3D, 0, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_3D }; case DxbcResourceDim::Texture3D: return { spv::Dim3D, 0, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_3D };
case DxbcResourceDim::TextureCube: return { spv::DimCube, 0, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_CUBE }; case DxbcResourceDim::TextureCube: return { spv::DimCube, 0, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_CUBE };
case DxbcResourceDim::TextureCubeArr: return { spv::DimCube, 1, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_CUBE_ARRAY }; case DxbcResourceDim::TextureCubeArr: return { spv::DimCube, 1, 0, isUav ? 2u : 1u, VK_IMAGE_VIEW_TYPE_CUBE_ARRAY };

1
src/dxbc/dxbc_options.cpp
View File

@ -41,6 +41,7 @@ namespace dxvk {
enableRtOutputNanFixup = options.enableRtOutputNanFixup; enableRtOutputNanFixup = options.enableRtOutputNanFixup;
zeroInitWorkgroupMemory = options.zeroInitWorkgroupMemory; zeroInitWorkgroupMemory = options.zeroInitWorkgroupMemory;
forceTgsmBarriers = options.forceTgsmBarriers; forceTgsmBarriers = options.forceTgsmBarriers;
disableMsaa = options.disableMsaa;
dynamicIndexedConstantBufferAsSsbo = options.constantBufferRangeCheck; dynamicIndexedConstantBufferAsSsbo = options.constantBufferRangeCheck;
// Disable subgroup early discard on Nvidia because it may hurt performance // Disable subgroup early discard on Nvidia because it may hurt performance

3
src/dxbc/dxbc_options.h
View File

@ -57,6 +57,9 @@ namespace dxvk {
/// Insert memory barriers after TGSM stoes /// Insert memory barriers after TGSM stoes
bool forceTgsmBarriers = false; bool forceTgsmBarriers = false;
/// Replace ld_ms with ld
bool disableMsaa = false;
/// Float control flags /// Float control flags
DxbcFloatControlFlags floatControl; DxbcFloatControlFlags floatControl;