Merge pull request #16491 from unknownbrackets/cleanup

Quick cleanup
This commit is contained in:
Henrik Rydgård 2022-12-03 16:38:32 +01:00 committed by GitHub
commit 238c9439e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View File

@ -121,7 +121,7 @@ VkCommandBuffer FrameData::GetInitCmd(VulkanContext *vulkan) {
}
void FrameData::SubmitPending(VulkanContext *vulkan, FrameSubmitType type, FrameDataShared &sharedData) {
VkCommandBuffer cmdBufs[2];
VkCommandBuffer cmdBufs[3];
int numCmdBufs = 0;
VkFence fenceToTrigger = VK_NULL_HANDLE;

View File

@ -751,7 +751,7 @@ static void DelayPsmfStateChange(u32 psmfPlayer, u32 newState, s64 delayUs) {
}
static u32 scePsmfSetPsmf(u32 psmfStruct, u32 psmfData) {
if (!Memory::IsValidAddress(psmfData) || !Memory::IsValidAddress(psmfData)) {
if (!Memory::IsValidAddress(psmfStruct) || !Memory::IsValidAddress(psmfData)) {
// Crashes on a PSP.
return hleReportError(ME, SCE_KERNEL_ERROR_ILLEGAL_ADDRESS, "bad address");
}

View File

@ -99,7 +99,7 @@ void DrawEngineDX9::ApplyDrawState(int prim) {
if (!gstate.isModeClear()) {
textureCache_->ApplyTexture();
if (fboTexBindState_ = FBO_TEX_COPY_BIND_TEX) {
if (fboTexBindState_ == FBO_TEX_COPY_BIND_TEX) {
// Note that this is positions, not UVs, that we need the copy from.
framebufferManager_->BindFramebufferAsColorTexture(1, framebufferManager_->GetCurrentRenderVFB(), BINDFBCOLOR_MAY_COPY, 0);
// If we are rendering at a higher resolution, linear is probably best for the dest color.

View File

@ -141,7 +141,7 @@ VkDescriptorSet VulkanComputeShaderManager::GetDescriptorSet(VkImageView image,
VkDescriptorSet desc = frameData.descPool.Allocate(1, &descriptorSetLayout_, "compute_descset");
_assert_(desc != VK_NULL_HANDLE);
VkWriteDescriptorSet writes[2]{};
VkWriteDescriptorSet writes[3]{};
int n = 0;
VkDescriptorImageInfo imageInfo = {};
VkDescriptorBufferInfo bufferInfo[2] = {};