Emulation/GPCS4
1
0
Fork 0
mirror of https://github.com/Inori/GPCS4.git synced 2024-05-20 13:07:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

use image swizzle to map some non-vulkan formats

Browse source
This commit is contained in:
Asuka 2022-07-20 02:04:37 +08:00
parent b6fb21dc16
commit b0b9c2831f
3 changed files with 50 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
GPCS4/Graphics/Gcn/GcnCompilerVectorMemory.cpp
View file

@ -782,12 +782,7 @@ namespace sce::gcn
break;
}
// The ISA set says dmask mask RGBA from LSB to MSB,
// but it should be the reverse, which is
// DMASK[0] = alpha, DMASK[1] = blue, DMASK[2] = green, DMASK[3] = red
uint8_t byte = util::bit::reverseByte(mimg.control.dmask);
uint32_t mask = byte >> 4;
auto colorMask = GcnRegMask(mask);
auto colorMask = GcnRegMask(mimg.control.dmask);
result = emitRegisterExtract(result, colorMask);
emitVgprArrayStore(mimg.vdata,
result,

51
GPCS4/Graphics/Gnm/GnmResourceFactory.cpp
View file

@ -211,12 +211,15 @@ namespace sce::Gnm
default: flags = 0; break;
}
uint32_t mipLevelCount = tsharp->getLastMipLevel() - tsharp->getBaseMipLevel() + 1;
uint32_t sliceCount = tsharp->getLastArraySliceIndex() - tsharp->getBaseArraySliceIndex() + 1;
uint32_t mipLevelCount = tsharp->getLastMipLevel() -
tsharp->getBaseMipLevel() + 1;
uint32_t sliceCount = tsharp->getLastArraySliceIndex() -
tsharp->getBaseArraySliceIndex() + 1;
auto format = tsharp->getDataFormat();
VltImageCreateInfo imageInfo;
imageInfo.type = cvt::convertTextureType(textureType);
imageInfo.format = cvt::convertDataFormat(tsharp->getDataFormat());
imageInfo.format = cvt::convertDataFormat(format);
imageInfo.flags = flags;
imageInfo.sampleCount = cvt::convertNumFragments(tsharp->getNumFragments());
imageInfo.extent = { tsharp->getWidth(), tsharp->getHeight(), tsharp->getDepth() };
@ -237,6 +240,7 @@ namespace sce::Gnm
viewInfo.numLevels = mipLevelCount;
viewInfo.minLayer = tsharp->getBaseArraySliceIndex();
viewInfo.numLayers = sliceCount;
viewInfo.swizzle = calculateSwizzle(format);
sceTexture.image = m_device->createImage(imageInfo, createInfo.memoryType);
sceTexture.imageView = m_device->createImageView(sceTexture.image, viewInfo);
@ -361,6 +365,45 @@ namespace sce::Gnm
// Otherwise, we have to stick with the default layout
return VK_IMAGE_LAYOUT_GENERAL;
}
VkComponentMapping GnmResourceFactory::calculateSwizzle(DataFormat format)
{
VkComponentMapping result;
auto selectComponent = [](TextureChannel channel)
{
switch (channel)
{
case Gnm::kTextureChannelConstant0: return VK_COMPONENT_SWIZZLE_ZERO;
case Gnm::kTextureChannelConstant1: return VK_COMPONENT_SWIZZLE_ONE;
case Gnm::kTextureChannelX: return VK_COMPONENT_SWIZZLE_R;
case Gnm::kTextureChannelY: return VK_COMPONENT_SWIZZLE_G;
case Gnm::kTextureChannelZ: return VK_COMPONENT_SWIZZLE_B;
case Gnm::kTextureChannelW: return VK_COMPONENT_SWIZZLE_A;
}
};
auto x = static_cast<TextureChannel>(format.m_bits.m_channelX);
result.r = x == Gnm::kTextureChannelX
? VK_COMPONENT_SWIZZLE_IDENTITY
: selectComponent(x);
auto y = static_cast<TextureChannel>(format.m_bits.m_channelY);
result.g = y == Gnm::kTextureChannelY
? VK_COMPONENT_SWIZZLE_IDENTITY
: selectComponent(y);
auto z = static_cast<TextureChannel>(format.m_bits.m_channelZ);
result.b = z == Gnm::kTextureChannelZ
? VK_COMPONENT_SWIZZLE_IDENTITY
: selectComponent(z);
auto w = static_cast<TextureChannel>(format.m_bits.m_channelW);
result.a = w == Gnm::kTextureChannelW
? VK_COMPONENT_SWIZZLE_IDENTITY
: selectComponent(w);
return result;
}
} // namespace sce::Gnm

2
GPCS4/Graphics/Gnm/GnmResourceFactory.h
View file

@ -80,6 +80,8 @@ namespace sce
VkImageLayout optimizeLayout(VkImageUsageFlags usage);
VkComponentMapping calculateSwizzle(DataFormat format);
private:
vlt::VltDevice* m_device;
vlt::VltDebugUtil m_debugUtil;