RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-09 08:25:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

rpcsx-gpu: fix IT_DRAW_INDEX_2

Browse source 
fix IT_INDEX_BASE
fix depth size
fix image_get_lod
This commit is contained in:
DH 2024-10-06 13:03:30 +03:00
parent e4866cd2eb
commit 42ad5c1cc9
5 changed files with 85 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

41
rpcsx-gpu/Renderer.cpp
View file

@ -33,22 +33,37 @@ VkRect2D toVkRect2D(amdgpu::PaScRect rect) {
}
amdgpu::PaScRect intersection(amdgpu::PaScRect lhs, amdgpu::PaScRect rhs) {
if (!lhs.isValid()) {
return rhs;
if (lhs.left > lhs.right) {
lhs.left = rhs.left;
}
if (!rhs.isValid()) {
return lhs;
if (lhs.top > lhs.bottom) {
lhs.top = rhs.top;
}
amdgpu::PaScRect result{
if (rhs.left > rhs.right) {
rhs.left = lhs.left;
}
if (rhs.top > rhs.bottom) {
rhs.top = lhs.top;
}
return {
.left = std::max(lhs.left, rhs.left),
.top = std::max(lhs.top, rhs.top),
.right = std::min(lhs.right, rhs.right),
.bottom = std::min(lhs.bottom, rhs.bottom),
};
}
return result;
amdgpu::PaScRect extend(amdgpu::PaScRect lhs, amdgpu::PaScRect rhs) {
return {
.left = std::max(lhs.left, rhs.left),
.top = std::max(lhs.top, rhs.top),
.right = std::max(lhs.right, rhs.right),
.bottom = std::max(lhs.bottom, rhs.bottom),
};
}
} // namespace gnm
@ -192,6 +207,8 @@ void amdgpu::draw(GraphicsPipe &pipe, int vmId, std::uint32_t firstVertex,
// FIXME
stencilAccess = Access::None;
amdgpu::PaScRect drawRect{};
for (auto &cbColor : pipe.context.cbColor) {
if (targetMask == 0) {
break;
@ -211,6 +228,8 @@ void amdgpu::draw(GraphicsPipe &pipe, int vmId, std::uint32_t firstVertex,
auto viewPortRect = gnm::toVkRect2D(viewPortScissor);
drawRect = gnm::extend(drawRect, viewPortScissor);
viewPorts[renderTargets].x = viewPortRect.offset.x;
viewPorts[renderTargets].y = viewPortRect.offset.y;
viewPorts[renderTargets].width = viewPortRect.extent.width;
@ -373,8 +392,6 @@ void amdgpu::draw(GraphicsPipe &pipe, int vmId, std::uint32_t firstVertex,
}
if (depthAccess != Access::None) {
auto screenRect = gnm::toVkRect2D(pipe.context.paScScreenScissor);
auto imageView = cacheTag.getImageView(
{
.readAddress = static_cast<std::uint64_t>(pipe.context.dbZReadBase)
@ -386,11 +403,11 @@ void amdgpu::draw(GraphicsPipe &pipe, int vmId, std::uint32_t firstVertex,
.nfmt = gnm::getNumericFormat(pipe.context.dbZInfo.format),
.extent =
{
.width = screenRect.extent.width,
.height = screenRect.extent.height,
.width = pipe.context.dbDepthSize.getPitch(),
.height = pipe.context.dbDepthSize.getHeight(),
.depth = 1,
},
.pitch = screenRect.extent.width,
.pitch = pipe.context.dbDepthSize.getPitch(),
.mipCount = 1,
.arrayLayerCount = 1,
.kind = ImageKind::Depth,
@ -466,7 +483,7 @@ void amdgpu::draw(GraphicsPipe &pipe, int vmId, std::uint32_t firstVertex,
VkRenderingInfo renderInfo{
.sType = VK_STRUCTURE_TYPE_RENDERING_INFO,
.renderArea = gnm::toVkRect2D(pipe.context.paScScreenScissor),
.renderArea = gnm::toVkRect2D(drawRect),
.layerCount = 1,
.colorAttachmentCount = renderTargets,
.pColorAttachments = colorAttachments,